Merge branch 'B2C' of http://gitlab.oytour.com/zk123/jz_travel into B2C

manifest.json

@@ -70,9 +70,7 @@
     /* 小程序特有相关 */
     "mp-weixin" : {
         "appid": "wxcf0727a7c78b501e",
-        "navigateToMiniProgramAppIdList": [
-            "wxacd9f8cc3480d29e"
-        ],
+        "navigateToMiniProgramAppIdList" : [ "wxacd9f8cc3480d29e" ],
         "setting" : {
             "urlCheck" : true,
             "minified" : false

pages/user-center/points.vue

@@ -39,6 +39,12 @@
 								</text>
 								<!-- v-if="CustomerIntegral&&CustomerIntegral.saleList&&CustomerIntegral.saleList.length>0" -->
 								<view class="row">
+									<!-- #ifdef MP-DI -->
+									<text class="userHeadPicR_text" @click="goTisp">
+										积分规则
+									</text>
+									<!-- #endif -->
+									<!-- #ifdef MP-AG -->
 									<div class="userHeadPicR_text flex-1 row col" @click="goExchange">
 										<text>积分商场</text>
 										<u-icon name="arrow" :size="26" color="#61462E" style=""></u-icon>
@@ -52,6 +58,8 @@
 										<!-- 销售:{{ CustomerIntegral.saleList[0].saleName }}<template v-if="CustomerIntegral.saleList.length>0">等{{CustomerIntegral.saleList.length}}位</template> -->
 										<!-- #endif -->
 									</text>
+									<!-- #endif -->
+									
 								</view>
 							</view>
 						</view>