Merge branch 'v5.0.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.0.0dev

template/admin/src/pages/kefu/pc/components/chatList.vue

@@ -21,7 +21,7 @@
           @click="selectUser(item)"
         >
           <div class="avatar">
-            <img v-lazy="item.avatar" alt="" />
+            <img v-lazy="item.wx_avatar" alt="" />
             <div class="status" :class="{ off: item.online == 0 }"></div>
           </div>
           <div class="user-info">

template/admin/src/pages/marketing/storeBargain/statistics.vue

@@ -235,7 +235,7 @@ export default {
         {
           col: 8,
           count: 0,
-          name: '推广人数（人）',
+          name: '砍价人数（人）',
           className: 'ios-speedometer-outline',
         },
         {

template/admin/src/pages/order/orderList/components/tableList.vue

@@ -23,6 +23,9 @@
         <span class="nickname">{{ row.nickname }}</span> |
         <span class="uid">{{ row.uid }}</span>
       </template>
+      <template slot-scope="{ row, index }" slot="pay_price">
+        <span>{{ row.paid ? row.pay_price : '未支付' }}</span>
+      </template>
       <template slot-scope="{ row, index }" slot="info">
         <div class="tabBox" v-for="(val, i) in row._info" :key="i">
           <div class="tabBox_img" v-viewer>
@@ -262,7 +265,7 @@ export default {
         },
         {
           title: '实际支付',
-          key: 'pay_price',
+          slot: 'pay_price',
           align: 'center',
           width: 100,
         },

template/uni-app/App.vue

@@ -123,6 +123,13 @@
 		async onLaunch(option) {
 			uni.hideTabBar()
 			let that = this;
+			// #ifdef H5
+			if (option.query.hasOwnProperty('type') && option.query.type == "iframeWindow") {
+				this.globalData.isIframe = true;
+			} else {
+				this.globalData.isIframe = false;
+			}
+			// #endif
 			colorChange('color_change').then(res => {
 				uni.setStorageSync('is_diy', res.data.is_diy)
 				uni.$emit('is_diy', res.data.is_diy)
@@ -245,13 +252,7 @@
 			}
 			// #endif
 
-			// #ifdef H5
-			if (option.query.hasOwnProperty('type') && option.query.type == "iframeWindow") {
-				this.globalData.isIframe = true;
-			} else {
-				this.globalData.isIframe = false;
-			}
-			// #endif
+
 			// #ifdef MP
 			// 小程序静默授权
 			// if (!this.$store.getters.isLogin) {

template/uni-app/pages/goods/cashier/index.vue

@@ -178,7 +178,7 @@
 			getBasicConfig() {
 				basicConfig().then(res => {
 					//微信支付是否开启
-					this.cartArr[0].payStatus = res.data.wechat_pay_status || 0
+					this.cartArr[0].payStatus = res.data.pay_weixin_open || 0
 					//支付宝是否开启
 					this.cartArr[1].payStatus = res.data.ali_pay_status || 0;
 					//#ifdef MP