更新功能修复bug

components/Loading.vue

@@ -0,0 +1,95 @@
+<template>
+    <div class="popup" v-if="isShow">
+      <div class="box">
+        <div class="loading"></div>
+        <p>{{str}}</p>
+      </div>
+    </div>
+</template>
+
+<script>
+  export default {
+    name: 'Loading',
+    data() {
+      return {
+        isShow: false,
+        str: '加载中',
+        timer: null
+      };
+    },
+    mounted() {
+      uni.$on('showLoading', (type, str) => {
+        if (type == true) {
+          this.isShow = true;
+          this.str = str;
+        } else {
+          this.isShow = false;
+        }
+      })
+    },
+    methods: {
+      clickTow(){
+        
+      }
+    },
+  };
+</script>
+
+<style scoped lang="scss">
+  .popup-enter-active,
+  .popup-leave-active {
+    transition: opacity 0.3s ease-in-out;
+  }
+
+  .popup-enter,
+  .popup-leave-to {
+    opacity: 0;
+  }
+
+  .popup {
+    position: fixed;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    z-index: 99999999;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    flex-direction: column;
+    background-color: rgba(0, 0, 0, 0.2);
+    .box{
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-direction: column;
+      background-color: rgba(0, 0, 0, 0.5);
+      color: #eee;
+      height: 300rpx;
+      width: 300rpx;
+      border-radius: 20rpx;
+      box-sizing: border-box;
+      overflow: hidden;
+    }
+  }
+  
+  .loading {
+    width: 80rpx;
+    height: 80rpx;
+    border: 6rpx solid #eee;
+    border-top-color: transparent;
+    border-radius: 100%;
+    margin-bottom: 30rpx;
+  
+    animation: circle infinite 0.75s linear;
+  }
+  
+  @keyframes circle {
+    0% {
+      transform: rotate(0);
+    }
+    100% {
+      transform: rotate(360deg);
+    }
+  }
+</style>

main.js

@@ -17,10 +17,12 @@ import {
 } from '@/config/app';
 import skeleton from './components/skeleton/index.vue'
 import BaseMoney from './components/BaseMoney.vue';
+import Loading from './components/Loading.vue';
 import uView from '@/uni_modules/uview-ui'
 Vue.use(uView)
 Vue.component('skeleton', skeleton)
 Vue.component('BaseMoney', BaseMoney)
+Vue.component('Loading', Loading)
 Vue.prototype.$util = util;
 Vue.prototype.$Cache = Cache;
 Vue.prototype.$eventHub = new Vue();

manifest.json

@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.6.4",
+    "versionName" : "1.6.5",
-    "versionCode" : 164,
+    "versionCode" : 165,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/chat/customer_list/chat.vue

@@ -780,6 +780,7 @@
 					</div>
 				</div>
 				<div :style=" active === true ? 'height:' + footerConH + 'rem;' : 'height:' + footerH + 'rem;'"></div>
+        <div :style=" active === true ? 'height: 0;' : 'height: 2rem;'"></div>
 			</scroll-view>
 		</view>
 		<view style="height: 100rpx;"></view>
@@ -793,9 +794,9 @@
 						{{ speak }}
 					</div>
 					<view class="input_count">
-						<input type="text" placeholder-class='placeholder' placeholder="输入内容" class="input" ref="input"
+						<input type="text" placeholder-class='placeholder' :disabled="active" placeholder="输入内容" class="input" ref="input"
 							v-show="!voice" @input="bindInput" @keyup="keyup" @focus="focus" cursor-spacing="20"
-							v-model="textCon">
+							v-model="textCon" @click="handleClick">
 						<div class="send iconfont icon-fasong" :style="'color:'+iconColor" @click="sendTest"></div>
 					</view>
 				</div>
@@ -808,7 +809,6 @@
 							<i class="em" :class="emoji" :style="'background-image:url('+ httpUrl +')'"
 								v-for="emoji in emojiList" :key="emoji" @click="addEmoji(emoji)"></i>
 						</swiper-item>
-
 					</block>
 				</swiper>
 
@@ -1402,9 +1402,14 @@
 						});
 					});
 			},
-			focus: function() {
+			focus: async function() {
         this.active = false;
 			},
+      handleClick(){
+        if(this.active){
+          this.active = false;
+        }
+      },
 			keyup: function() {
 				if (this.$refs.input.value.length > 0) {
 					this.sendColor = true;
@@ -1560,7 +1565,7 @@
 							self.scrollTop = parseInt(scrollTop) + 100
 						}
 					}).exec()
-				}, 1000)
+				}, 200)
 			},
 			// 滚动到头部
 			bindScroll() {
@@ -1626,7 +1631,8 @@
 		margin-top: 20rpx;
 		width: 710rpx;
 		position: fixed;
-		bottom: 160rpx;
+		bottom: 180rpx;
+    bottom: calc(160rpx + env(safe-area-inset-bottom)); /* 适应底部安全距离 */
 		left: 20rpx;
 
 		.broadcast-details_box,
@@ -1967,11 +1973,10 @@
 		transition: all 0.005s cubic-bezier(0.25, 0.5, 0.5, 0.9);
 		background-color: #fff;
 		position: fixed;
-		bottom:var(--status-bar-height);
+		// bottom:var(--status-bar-height);
+    bottom: 20rpx;
+    bottom: calc(20rpx + env(safe-area-inset-bottom) );
 		left: 0;
-	
-		
-
 	}
 
 	.broadcast-details .footerCon.on {

pages/gather/gather.vue

@@ -81,6 +81,7 @@
 		        </view>
 		      </template>
 		    </m-tabbar> -->
+      <Loading></Loading>
 	</view>
 </template>
 
@@ -287,7 +288,6 @@
 				this.jurisdiction = true
 			}
 			this.getUserInfo()
-
 		},
 
 		onPullDownRefresh() {
@@ -328,7 +328,9 @@
 			}
 		},
 		// #endif
-
+    onHide() {
+      uni.$emit('showLoading', false);
+    },
 		methods: {
 			getPositionFn() {
 				this.street = '定位中'
@@ -435,6 +437,7 @@
 			},
 			getUniMp(type, data) {
 				let that = this;
+        
 				// #ifdef APP-PLUS
 				switch (type) {
 					case 1:

pages/goods_details/index.vue

@@ -787,6 +787,7 @@
 						title: res.message
 					})
 				}).catch(err => {
+          console.log(err);
 					//状态异常返回上级页面
 					return that.$util.Tips({
 						title: err
@@ -1060,14 +1061,14 @@
 					}
 					that.$set(that, 'storeInfo', storeInfo);
 					that.$set(that, 'description', storeInfo.content);
-          if(typeof that.description.content == 'string'){
+          if(that.description?.content && typeof that.description.content == 'string'){
             try{
               that.description.content = JSON.parse(that.description.content);
             }catch(e){
               console.log(e);
             }
           }
-					if (that.description.type == 0 && typeof that.description.content == 'string') {
+					if (that.description?.content && that.description?.type == 0 && typeof that.description?.content == 'string') {
 						that.description.content = that.description.content.replace(
 							/<img/gi,
 							'<img style="max-width:100%;height:auto;float:left;display:block" '
@@ -1122,6 +1123,7 @@
 						that.getCouponList();
 					})
 				}).catch(err => {
+          console.log(err);
 					//状态异常返回上级页面
 					return that.$util.Tips({
 						title: err

pages/nongKe/cloud_entrepot/indexb.vue

@@ -398,6 +398,12 @@
           type: 2
         })
         this.cloudList = data;
+        this.cloudList.forEach((item)=>{
+          item.children.unshift({
+            cate_name: '全部',
+            store_category_id: item.store_category_id,
+          });
+        })
         this.merchant = this.cloudList[0];
         this.merchantTow = this.merchant?.children[0];
         this.storeParam.category_id = this.merchantTow.store_category_id;
@@ -719,14 +725,16 @@
           this.storeParam.page = 1;
           this.goodsList = [];
         }
-        townCloud({
+        let query = {
           street_code: this.street_id,
-          category_id: this.storeParam.category_id,
           order: this.storeParam.order,
           keyword: this.storeParam.keyword,
           page: this.storeParam.page,
           location: this.latitude+','+this.longitude,
-        }).then(res => {
+        }
+        if(!this.merchantTow.pid) query.cate_pid = this.storeParam.category_id; // 全部是查询一级分类pid
+        else query.category_id = this.storeParam.category_id; // 否则查询二级分类
+        townCloud(query).then(res => {
           this.goodsList = [...this.goodsList, ...res.data.list]
           this.showLoading = false
           this.goodsList.forEach(item => {

pages/users/order_list/index.vue

@@ -569,6 +569,7 @@ import { Toast } from '../../../libs/uniApi';
 
 					let self = this
             
+
 					if (!order_id) return that.$util.Tips({
 						title: '缺少订单号无法查看订单详情'
 					});
@@ -576,7 +577,6 @@ import { Toast } from '../../../libs/uniApi';
 					uni.showLoading({
 						title: '正在加载',
 					})
-
 					openOrderSubscribe().then(() => {
 
 						uni.hideLoading();
@@ -599,6 +599,7 @@ import { Toast } from '../../../libs/uniApi';
 					})
 					// #endif
 					// #ifndef MP
+          console.log(self.orderStatus);
 					if (self.orderStatus == 0) {
 						uni.navigateTo({
 							url: '/pages/order_details/stay?order_id=' + order_id
@@ -655,7 +656,6 @@ import { Toast } from '../../../libs/uniApi';
 				 */
 				statusClick: function(status) {
 					if (status == this.orderStatus) return;
-
 					this.orderStatus = status;
 					this.loadend = false;
 					this.loading = false;

utils/uniMP.js

@@ -35,10 +35,7 @@ const loadMP = async (id) => {
 	console.log('最新版本', info.data);
 	console.log(mp, uni);
 	// return ;
-	uni.showLoading({
+	uni.$emit('showLoading', true, '初始化中');
-		title: '初始化中...',
-		mask: true
-	})
 	mp.getUniMPVersion(id, (ret) => {
 		console.log('当前版本', ret);
 		let flag;
@@ -51,15 +48,9 @@ const loadMP = async (id) => {
 			true) {
 			let count = 0;
 			timer = setInterval(() => {
-				if (count < 100) uni.showLoading({
+				if (count < 100 && count > 0) uni.$emit('showLoading', true, `初始化中... ${count}%`)
-					title: `初始化中... ${count}%`,
+				else uni.$emit('showLoading', true, `初始化中... 99%`)
-					mask: true
+			}, 200)
-				})
-				else uni.showLoading({
-					title: '初始化中...99%',
-					mask: true
-				})
-			}, 600)
 			let downloadTask = uni.downloadFile({
 				url: info.data.version_info?.dow_url,
 				success(res) {
@@ -99,10 +90,7 @@ const loadMPx = async (id) => {
 	console.log('最新版本', info.data);
 	console.log(mp, uni);
 	// return ;
-	uni.showLoading({
+	uni.$emit('showLoading', true, `初始化中...`)
-		title: '初始化中...',
-		mask: true
-	})
 	mp.getUniMPVersion(id, (ret) => {
 		console.log('当前版本', ret);
 		let flag;
@@ -116,15 +104,9 @@ const loadMPx = async (id) => {
 			true) {
 			let count = 0;
 			timer = setInterval(() => {
-				if (count < 100) uni.showLoading({
+				if (count < 100 && count > 0) uni.$emit('showLoading', true, `初始化中... ${count}%`)
-					title: `初始化中... ${count}%`,
+				else uni.$emit('showLoading', true, `初始化中... 99%`)
-					mask: true
+			}, 200)
-				})
-				else uni.showLoading({
-					title: '初始化中...99%',
-					mask: true
-				})
-			}, 600)
 
 			let downloadTask = uni.downloadFile({
 				url: info.data.appInfo.dow_url,
@@ -161,10 +143,7 @@ const loadMPx = async (id) => {
 const loadMPurl = async (e) => {
 	appid = e.id;
   let FURL = e.url;
-	uni.showLoading({
+	uni.$emit('showLoading', true, `初始化中...`)
-		title: '初始化中...',
-		mask: true
-	})
   uni.request({
     url: FURL,
     method: 'GET',
@@ -181,15 +160,9 @@ const loadMPurl = async (e) => {
       		true) {
       		let count = 0;
       		timer = setInterval(() => {
-      			if (count < 100) uni.showLoading({
+      			if (count < 100 && count > 0) uni.$emit('showLoading', true, `初始化中... ${count}%`)
-      				title: `初始化中... ${count}%`,
+      			else uni.$emit('showLoading', true, `初始化中... 99%`)
-      				mask: true
+      		}, 200)
-      			})
-      			else uni.showLoading({
-      				title: '初始化中...99%',
-      				mask: true
-      			})
-      		}, 600)
       		let downloadTask = uni.downloadFile({
       			url: fileInfo.data?.data?.down_url,
       			success(res) {
@@ -232,21 +205,12 @@ const loadMPurl = async (e) => {
 const loadMPdns = async (e) => {
 	appid = e.id;
   let FURL = e.url;
-	uni.showLoading({
+	uni.$emit('showLoading', true, `初始化中...`)
-		title: '初始化中...',
-		mask: true
-	})
   let count = 0;
   timer = setInterval(() => {
-  	if (count < 100) uni.showLoading({
+  	if (count < 100 && count > 0) uni.$emit('showLoading', true, `初始化中... ${count}%`)
-  		title: `初始化中... ${count}%`,
+  	else uni.$emit('showLoading', true, `初始化中... 99%`)
-  		mask: true
+  }, 200)
-  	})
-  	else uni.showLoading({
-  		title: '初始化中...99%',
-  		mask: true
-  	})
-  }, 600)
   let downloadTask = uni.downloadFile({
   	url: FURL,
   	success(res) {
@@ -313,6 +277,7 @@ const doInstallMP = () => {
 };
 
 const open = (id = null) => {
+  uni.$emit('showLoading', false);
 	let token = uni.getStorageSync('LOGIN_STATUS_TOKEN');
 	if (!token) return uni.showToast({
 		icon: 'none',