Merge branch 'developer' of http://git.caimei365.com/caimei-repository/caimei-applets-caimei into developerX

pages/login/supplier_login.vue

@@ -93,7 +93,7 @@
         <tui-modal :show="show" custom @cancel="cancel">
             <view class="tui-modal-custom">
                 <view class="tui-modal-custom-text">周一至周五 9:00~1800</view>
-                <view class="tui-modal-custom-phone" @click=";(modal = true), (show = false)">153-3889-7365</view>
+                <view class="tui-modal-custom-phone" @click=";(modal = true), (show = false)">131-6478-0233</view>
             </view>
         </tui-modal>
         <tui-modal :show="isPhone" class="qrcode" custom @cancel="cancel">
@@ -110,7 +110,7 @@
             <view class="tui-modal-custom-call">
                 <view class="tui-modal-custom-text">
                     确定拨打
-                    <text style="color: #FF5B00;font-weight: bold;margin: 0 6rpx;">153-3889-7365</text>
+                    <text style="color: #FF5B00;font-weight: bold;margin: 0 6rpx;">131-6478-0233</text>
                     吗？
                 </view>
                 <view class="modal-btns">
@@ -300,7 +300,7 @@ export default {
         // 拨打电话
         handleClick() {
             uni.makePhoneCall({
-                phoneNumber: '153-3889-7365' //仅为示例
+                phoneNumber: '131-6478-0233' //仅为示例
             })
             this.modal = false
         },
@@ -451,7 +451,7 @@ export default {
     }
     .tui-modal-custom-qrcode {
         width: 412rpx;
-        height: 412rpx;
+        height: 460rpx;
     }
 }
 .modal-btns {

pages/search/mixins/searchMixins.js

@@ -17,7 +17,11 @@ const searchMixins = {
             }
             return ''
         },
-        highLight(content, key, res) {
+        isInterceptHtmlFn(text) {
+            let name = this.$reg.interceptHtmlFn(text)
+            return name
+        },
+        handeleCeptText(content, key, res) {
             if (res == undefined) {
                 res = []
             }
@@ -39,7 +43,7 @@ const searchMixins = {
                         text: y
                     })
                     content = content.substring(index + keyLen, content.length)
-                    this.highLight(content, key, res)
+                    this.handeleCeptText(content, key, res)
                 } else {
                     res.push({
                         type: 2,

pages/search/search.vue

@@ -202,10 +202,15 @@
 						<view class="list-details-title clearfix">
 							<text class="mclap-tag" v-if="pros.beautyActFlag == 1">美博会</text>
 							<view class="mclap" :class="pros.beautyActFlag == 1 ? 'indent' : ''">
-								<view v-for="item in highLight(isInterceptHtmlFn(pros.name),listQuery.keyword)" :key="item" style="float:left;">
-								  <text v-if="item.type==1" decode="true" space="true" style='color: #ff5b00;'>{{ myReplace(item.text) }} </text>
-								  <text v-else decode="true" space="true">{{myReplace(item.text)}}</text>
-								</view>
+								<text v-for="(item, itemIndex) in handeleCeptText(isInterceptHtmlFn(pros.name),listQuery.keyword)" 
+									  :key="itemIndex" 
+									  :style="{ color : item.type === 1 ? '#ff5b00' : '#333333' }">
+									{{ item.text }}
+								</text>
+								<!-- <view v-for="(item, itemIndex) in pros.name" :key="itemIndex" style="float:left;">
+								  <text v-if="item.type ==1" style='color: #ff5b00;'>{{ item.text }} </text>
+								  <text v-else>{{ item.text }}</text>
+								</view> -->
 							</view>
 						</view>
 						<text class="list-details-specs">规格：{{ pros.unit }}</text>
@@ -754,6 +759,7 @@ export default {
 					if (loadMore) {
 						this.listData = [...this.listData, ...dataList]
 						this.getProductPrice()
+						
 					} else {
 						this.listData = [...dataList]
 						this.getProductPrice()
@@ -971,10 +977,6 @@ export default {
 				this.isFocus = true
 			}
 		},
-		isInterceptHtmlFn(text) {
-			let name = this.$reg.interceptHtmlFn(text)
-			return name
-		},
 		navToDetailPage(id) {
 			this.isModallayer = true
 			this.$api.navigateTo(`/pages/goods/product?id=${id}`)
@@ -1066,7 +1068,6 @@ export default {
 			}
 		},
 		topBubble() {
-			console.log('1111111111')
 			//显隐搜索项
 			this.showBubblePopup = !this.showBubblePopup
 		}

pages/seller/cart/components/immediatelyList.vue

@@ -254,7 +254,7 @@
 			:skuProduct="handleProsData"
 			@handleUnitConfirm="hanldeSupporUnitConfirm"
 			@skuClick="handleSkuClick"
-		></cmUnitSupporPopup>
+		/>
 		<!-- 可拖动悬浮按钮 -->
 		<cm-drag
 			v-if="!showSkeleton"
@@ -264,10 +264,9 @@
 			@btnClick="btnClick"
 			@btnTouchstart="btnTouchstart"
 			@btnTouchend="btnTouchend"
-		>
-		</cm-drag>
+		/>
 		<!-- 透明模态层 -->
-		<modal-layer v-if="isModallayer"></modal-layer>
+		<modal-layer v-if="isModallayer" />
 	</view>
 </template>
 
@@ -423,6 +422,7 @@ export default {
 							this.isShowEmptyText = '暂无相关商品'
 						}
 					}
+					this.showSkeleton = false
 				})
 				.catch(error => {
 					this.$util.msg(error.msg, 2000)
@@ -510,7 +510,6 @@ export default {
 							this.combinationProduct = [...this.combinationProduct, ...responseData.results]
 						} else {
 							this.combinationProduct = [...responseData.results]
-
 							this.showSkeleton = false
 						}
 						// 防上拉暴滑
@@ -527,6 +526,7 @@ export default {
 						}
 					} else {
 						this.isShowEmpty = true
+						this.showSkeleton = false
 						this.isShowEmptyText = '暂无相关商品'
 					}
 				})

pages/seller/remarks/add-record.vue

@@ -637,10 +637,12 @@ export default {
 			})
 			console.log('trendsLabelsList', trendsLabelsList)
 			// 标签必须有一项
-			if (!this.firstLabelList.length && !trendsLabelsList.length && !staticLabelsList.length) {
-				  this.modal = true
-				  this.contentModalText = '标签必须选择或者填写一项' 
-				  return
+			if(this.remarksParams.communicationSituation !== 1){
+				if (!this.firstLabelList.length && !trendsLabelsList.length && !staticLabelsList.length) {
+					  this.modal = true
+					  this.contentModalText = '标签必须选择或者填写一项' 
+					  return
+				}
 			}
 			if(this.firstLabelList.length > 0){
 				this.remarksParams.remarks = JSON.stringify(this.firstLabelList)

pages/seller/remarks/add.vue

@@ -704,10 +704,12 @@ export default {
 			})
 			console.log('trendsLabelsList', trendsLabelsList)
 			// 标签必须有一项
-			if (!this.firstLabelList.length && !trendsLabelsList.length && !staticLabelsList.length) {
-				  this.modal = true
-				  this.contentModalText = '标签必须选择或者填写一项' 
-				  return
+			if(this.remarksParams.communicationSituation !== 1){
+				if (!this.firstLabelList.length && !trendsLabelsList.length && !staticLabelsList.length) {
+					  this.modal = true
+					  this.contentModalText = '标签必须选择或者填写一项' 
+					  return
+				}
 			}
 			if(this.firstLabelList.length > 0){
 				this.remarksParams.remarks = JSON.stringify(this.firstLabelList)

services/config.env.js

@@ -5,8 +5,8 @@ if(process.env.NODE_ENV === 'development'){
     // URL_CONFIG = 'http://192.168.2.68:18002'	 //涛涛联调地址
     // URL_CONFIG = 'http://192.168.2.102:18002' //志国联调地址
     // URL_CONFIG = 'http://192.168.2.103:18002'    //陈凯联调地址
-    URL_CONFIG = 'https://core-b.caimei365.com'
-    // URL_CONFIG = 'https://core.caimei365.com'   
+    // URL_CONFIG = 'https://core-b.caimei365.com'
+    URL_CONFIG = 'https://core.caimei365.com'    
 }else{
     // 生产环境
     // URL_CONFIG = 'https://core-b.caimei365.com'