Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

template/admin/src/pages/marketing/live/add_goods.vue

@@ -117,23 +117,23 @@ export default {
             });
           },
         },
-        {
-          key: 'cost_price',
-          title: '直播原价',
-          render: (h, params) => {
-            return h('Input', {
-              props: {
-                type: 'number',
-                value: params.row.cost_price,
-              },
-              on: {
-                input: (val) => {
-                  this.tabList[params.index].cost_price = val;
-                },
-              },
-            });
-          },
-        },
+        // {
+        //   key: 'cost_price',
+        //   title: '直播原价',
+        //   render: (h, params) => {
+        //     return h('Input', {
+        //       props: {
+        //         type: 'number',
+        //         value: params.row.cost_price,
+        //       },
+        //       on: {
+        //         input: (val) => {
+        //           this.tabList[params.index].cost_price = val;
+        //         },
+        //       },
+        //     });
+        //   },
+        // },
         { key: 'stock', title: '库存' },
         { slot: 'action', fixed: 'right', title: '操作' },
       ],

template/admin/src/pages/setting/verifyOrder/index.vue

@@ -27,7 +27,7 @@
           </Col>
           <Col span="12" class="ivu-text-left">
             <FormItem label="筛选条件：">
-              <Input enter-button placeholder="请输入搜索内容" v-model="formValidate.real_name" style="width: 90%">
+              <Input enter-button placeholder="请输入搜索内容" v-model="formValidate.real_name" style="width: 430px">
                 <Select v-model="field_key" slot="prepend" style="width: 80px">
                   <Option value="all">全部</Option>
                   <Option value="order_id">订单号</Option>
@@ -41,7 +41,8 @@
           </Col>
           <Col span="12" class="mr">
             <FormItem label="选择门店：" label-for="store_name">
-              <Select v-model="formValidate.store_id" element-id="store_id" clearable @on-change="userSearchs">
+                
+              <Select v-model="formValidate.store_id" element-id="store_id" clearable @on-change="userSearchs" style="width: 430px">
                 <Option v-for="item in storeSelectList" :value="item.id" :key="item.id">{{ item.name }}</Option>
               </Select>
             </FormItem>

template/uni-app/pages/admin/orderDetail/index.vue

@@ -718,7 +718,6 @@
 
 	.order-details .wrapper .item .conter {
 		color: #868686;
-		width: 500upx;
 		text-align: right;
 	}
 

template/uni-app/pages/extension/customer_list/chat.vue

@@ -1,13 +1,13 @@
 <template>
 	<view class="chat-box" :style="colorStyle">
 		<!-- #ifdef MP -->
-		<view class="head-box">
+<!-- 		<view class="head-box">
 			<view class="system-head" :style="{ height: sysHead }"></view>
 			<view class="title-hd">
 				<view class="iconfont icon-fanhui" @click="goBack"></view>
 				<view>{{ titleName }}</view>
 			</view>
-		</view>
+		</view> -->
 		<!-- #endif -->
 		<view class="broadcast-details_order">
 			<!-- 商品信息 -->

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

@@ -59,6 +59,7 @@
 		<view class='noCommodity' v-if="productList.length==0 && where.page > 1">
 			<view class='emptyBox'>
 				<image :src="imgHost + '/statics/images/no-thing.png'"></image>
+				<view class="tips">{{$t(`暂无商品，去看点别的吧`)}}</view>
 			</view>
 			<recommend :hostProduct="hostProduct"></recommend>
 		</view>

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

@@ -38,9 +38,11 @@
 			<view @tap="goOrderDetails" v-if="status==0">
 				<button formType="submit" class='returnBnt bg-color' hover-class='none'>{{$t(`查看订单`)}}</button>
 			</view>
-			<view @tap="getOrderPayInfo" v-if="payType == 'ALLINPAY_PAY'">
+			<!-- #ifdef H5 -->
+			<view @tap="getOrderPayInfo" v-if="order_pay_info.paid==0">
 				<button class='returnBnt bg-color' hover-class='none'>{{$t(`刷新支付状态`)}}</button>
 			</view>
+			<!-- #endif -->
 			<view @tap="goOrderDetails" v-if="order_pay_info.paid==0 && status==1">
 				<button class='returnBnt bg-color' hover-class='none'>{{$t(`重新购买`)}}</button>
 			</view>

template/uni-app/pages/user/index.vue

@@ -529,30 +529,30 @@
 				})
 			},
 			getphonenumber(e) {
-				Routine.getCode()
-					.then(code => {
-						let data = {
-							code,
-							iv: e.detail.iv,
-							encryptedData: e.detail.encryptedData,
-						}
-						mpBindingPhone(data).then(res => {
-							this.getUserInfo()
-							this.$util.Tips({
-								title: res.msg,
-								icon: 'success'
-							});
-						}).catch(err => {
-							return this.$util.Tips({
-								title: err
-							});
+				if (e.detail.errMsg == 'getPhoneNumber:ok') {
+					Routine.getCode()
+						.then(code => {
+							let data = {
+								code,
+								iv: e.detail.iv,
+								encryptedData: e.detail.encryptedData,
+							}
+							mpBindingPhone(data).then(res => {
+								this.getUserInfo()
+								this.$util.Tips({
+									title: res.msg,
+									icon: 'success'
+								});
+							}).catch(err => {
+								return this.$util.Tips({
+									title: err
+								});
+							})
 						})
-					})
-					.catch(error => {
-						uni.hideLoading();
-					});
-
-				console.log(e)
+						.catch(error => {
+							uni.hideLoading();
+						});
+				}
 			},
 			/**
 			 * 获取个人用户信息