From 3cef4b0594e76718aad4dd756acf062f2df63d5b Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Mon, 29 May 2023 10:26:20 +0800
Subject: [PATCH] 1

---
 pages/columnGoods/goods_search_con/index.vue    |  8 ++++++++
 pages/order_pay_status/index.vue                |  2 +-
 pages/plantGrass/plant_user_attention/index.vue |  1 +
 pages/product/addGoods/index.vue                |  4 ++--
 pages/short_video/nvueSwiper/index.nvue         | 11 ++++++++++-
 pages/supply_chains/supply_chains.vue           |  8 ++++----
 pages/users/user_grade/index.vue                |  1 +
 project.config.json                             |  7 ++++---
 project.private.config.json                     |  6 +++++-
 9 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/pages/columnGoods/goods_search_con/index.vue b/pages/columnGoods/goods_search_con/index.vue
index b6cf77d..43ec03c 100644
--- a/pages/columnGoods/goods_search_con/index.vue
+++ b/pages/columnGoods/goods_search_con/index.vue
@@ -734,9 +734,17 @@
 					that.hotPage,
 					that.hotLimit,
 				).then(res => {
+					console.log(res);
 					that.hotPage++
 					that.hotScroll = res.data.list.length < that.hotLimit
 					that.hostProduct = that.hostProduct.concat(res.data.list)
+					if(that.hostProduct.length == res.data.count){
+						uni.showToast({
+						  title: '推荐商品,加载完毕',
+						  duration: 2000, // 显示时长，单位为毫秒
+						  icon: 'success' // 提示图标，可选值：success / loading / none
+						})
+					}
 				});
 			},
 			//点击事件处理
diff --git a/pages/order_pay_status/index.vue b/pages/order_pay_status/index.vue
index fd32617..af9c930 100644
--- a/pages/order_pay_status/index.vue
+++ b/pages/order_pay_status/index.vue
@@ -186,7 +186,7 @@
 			 */
 			goIndex: function(e) {
 				uni.switchTab({
-					url: '/pages/home/index'
+					url: '/pages/index/index'
 				});
 			},
 			// 去参团页面；
diff --git a/pages/plantGrass/plant_user_attention/index.vue b/pages/plantGrass/plant_user_attention/index.vue
index a52ff36..ff43f86 100644
--- a/pages/plantGrass/plant_user_attention/index.vue
+++ b/pages/plantGrass/plant_user_attention/index.vue
@@ -80,6 +80,7 @@
 					this.$util.Tips({
 						title: res.message
 					});
+						this.getList()
 				});
 			},
 			goHomepage(item){
diff --git a/pages/product/addGoods/index.vue b/pages/product/addGoods/index.vue
index 361acc2..b4467c4 100644
--- a/pages/product/addGoods/index.vue
+++ b/pages/product/addGoods/index.vue
@@ -151,7 +151,7 @@
       </view>
 
       <view class="popup_group">
-        <view v-if="deliveryType.length == 2" class="radio">
+        <view class="radio">
           <view class="radio_label ">送货方式</view>
           <checkbox-group class="select_group flex_start" @change="deliveryWayChange">
             <label class="radio_select" v-for="(val, i) in deliveryFreeList" :key="val.value">
@@ -163,7 +163,7 @@
           </checkbox-group>
         </view>
 
-        <view class="popup_group_item" v-if="setFormData.delivery_way.includes('2')">
+        <view class="popup_group_item" >
           <view class="popup_group_item_label">是否包邮</view>
           <view class="popup_group_item_value">
             <view class="popup_group_item_message">
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
index 2f3b8fb..5882b93 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -693,6 +693,7 @@
             is_star: that.isSatrt,
             community_id: that.videoID
           }).then(res => {
+			  console.log(res);
             that.videoData(res.data.list)
           }).catch(err => {
             return uni.showToast({
@@ -723,8 +724,16 @@
           page: that.page,
           limit: that.limit,
         }).then(res => {
+			console.log(res);
           that.loadVideo = false
-          that.videoData(res.data.list)
+		  const arr=[]
+		  res.data.list.forEach(item=>{
+			  if(item.is_type == '2'){
+				 return arr.push(item)
+			  }
+		  })
+		  this.limit=arr.length
+          that.videoData(arr)
         }).catch(err => {
           return uni.showToast({
             title: err,
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index b3cf378..b19d098 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="Circle_friends">
     <view class="circle_friends_wrapper">
-      <zbpSwiper :isSelectPlace="true" @selectPlce="selectPlce" :location_Arr="locationArr"></zbpSwiper>
+      <zbpSwiper style="z-index: 1;" :isSelectPlace="true" @selectPlce="selectPlce" :location_Arr="locationArr"></zbpSwiper>
       <view class="shop_wrapper">
         <!-- locationArr.address_reference.town.id -->
         <navigator class="l_yun" hover-class="none"
@@ -161,9 +161,9 @@
         })
       },
       go_shop() {
-        // if (this.mer_id == 0) {
-        //   return Toast('当前区域没有云仓库')
-        // }
+        if (this.mer_id == 0) {
+          return Toast('当前区域没有云仓库')
+        }
         uni.navigateTo({
           url: `/pages/nongKe/cloud_entrepot/index?street=${this.street_id}&town=${this.town}`
         })
diff --git a/pages/users/user_grade/index.vue b/pages/users/user_grade/index.vue
index 2df4859..0d86c7c 100644
--- a/pages/users/user_grade/index.vue
+++ b/pages/users/user_grade/index.vue
@@ -278,6 +278,7 @@
 			getMemberInfo(){
 				let that = this;
 				memberInfo().then(res => {
+					console.log(res);
 					let info = res.data
 					let value = info.next_level && info.next_level.brokerage_rule || null;
 					this.curLevel = info.member;
diff --git a/project.config.json b/project.config.json
index 46816f3..c485952 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,5 +1,5 @@
 {
-  "miniprogramRoot": "unpackage/dist/build/mp-weixin/",
+  "miniprogramRoot": "unpackage/dist/dev/mp-weixin/",
   "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
   "packOptions": {
     "ignore": [],
@@ -41,11 +41,12 @@
     "disableUseStrict": false,
     "minifyWXML": true,
     "showES6CompileOption": false,
-    "useCompilerPlugins": false
+    "useCompilerPlugins": false,
+    "condition": false
   },
   "compileType": "miniprogram",
   "libVersion": "2.14.3",
-  "appid": "wx5fb1cc8edb3f8baa",
+  "appid": "wx7502b94d6a53d589",
   "projectname": "crmeb_merchant_h5",
   "simulatorType": "wechat",
   "simulatorPluginLibVersion": {},
diff --git a/project.private.config.json b/project.private.config.json
index a354b95..01bf057 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -1,4 +1,8 @@
 {
   "libVersion": "2.24.2",
-  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html"
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "nk-shop2.0",
+  "setting": {
+    "compileHotReLoad": true
+  }
 }
\ No newline at end of file