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

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

@@ -24,7 +24,7 @@
               <div class="box">
                 <div class="box-item" v-for="(item, index) in goodsList" :key="index">
                   <img :src="item.image" alt="" />
-                  <Icon type="ios-close-circle" size="20" @click="bindDelete(index)" />
+                  <Icon type="ios-close-circle" size="20" @click="bindDelete(index,item)" />
                 </div>
                 <div class="upload-box" @click="selectGoods">
                   <Icon type="ios-camera-outline" size="36" />
@@ -182,10 +182,10 @@ export default {
         }, 300);
       });
     },
-    bindDelete(index) {
+    bindDelete(index,item) {
       this.goodsList.splice(index, 1);
       if (this.tabList.length) {
-        let i = this.tabList.findIndex((e) => e.id == row.id);
+        let i = this.tabList.findIndex((e) => e.id == item.product_id);
         this.tabList.splice(i, 1);
       }
     },

template/admin/src/pages/marketing/storeSeckill/create.vue

@@ -636,8 +636,9 @@ export default {
               h('InputNumber', {
                 props: {
                   min: 0,
-                  precision: key === 'price' ? 2 : 0,
                   value: key === 'price' ? params.row.price : params.row.quota,
+                  formatter: (value) =>
+                    key === 'price' ? `${value}`.match(/^\d+(?:\.\d{0,2})?/) : `${value}`.match(/^\d+(?:\.\d{0,-1})?/),
                 },
                 on: {
                   'on-change': (e) => {

template/admin/src/pages/order/invoice/index.vue

@@ -152,7 +152,7 @@
             <div class="title row">联系信息</div>
             <Row class="row">
               <Col span="12">真实姓名: {{ invoiceDetails.name }}</Col>
-              <Col span="12">联系电话: {{ invoiceDetails.user_phone }}</Col>
+              <Col span="12">联系电话: {{ invoiceDetails.drawer_phone }}</Col>
             </Row>
             <Row class="row">
               <Col span="12">联系邮箱: {{ invoiceDetails.email }}</Col>

template/uni-app/pages.json

@@ -69,9 +69,16 @@
 			"pages": [{
 					"path": "customer_list/chat",
 					"style": {
-						"navigationBarTitleText": "对话详情",
-						"navigationBarBackgroundColor": "#3875EA",
-						"navigationBarTextStyle": "white"
+						"navigationBarTitleText": "对话详情",
+						"navigationBarBackgroundColor": "#3875EA",
+						"navigationBarTextStyle": "white",
+						"app-plus": {
+							// #ifdef APP-PLUS
+							"titleNView": {
+								"type": "default"
+							}
+							// #endif
+						}
 					}
 				},
 				{

template/uni-app/pages/activity/goods_combination/index.vue

@@ -305,7 +305,8 @@
 					.name {
 						color: #333;
 						font-size: 30rpx;
-						height: 82rpx;
+						line-height: 38rpx;
+						height: 70rpx;
 					}
 
 					.bottom {

template/uni-app/pages/goods_cate/goods_cate.vue

@@ -49,11 +49,9 @@
 				getCategoryVersion().then(res => {
 					if (!uni.getStorageSync('CAT_VERSION') || res.data.version != uni.getStorageSync(
 							'CAT_VERSION')) {
-						this.isNew = !this.isNew
-						console.log('变了')
+						this.isNew = !this.isNew
 						uni.setStorageSync('CAT_VERSION', res.data.version)
-					} else {
-						console.log('没变')
+					} else {
 						// this.isNew = false
 					}
 					this.classStyle();

template/uni-app/pages/goods_cate/goods_cate1.vue

@@ -187,8 +187,7 @@
 				let that = this;
 				if (type || !uni.getStorageSync('CAT1_DATA')) {
 					getCategoryList().then(res => {
-						uni.setStorageSync('CAT1_DATA', res.data)
-						console.log('调了')
+						uni.setStorageSync('CAT1_DATA', res.data)
 						that.productList = res.data;
 						that.$nextTick(res => {
 							that.infoScroll();