From e3d544ae13c97edbdd4a65dca99525264b5ecf4c Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Mon, 11 Mar 2024 18:01:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                              |  4 +--
 pages/index/index.vue                      | 36 ++++++++++++++++------
 pages/margin/margin.vue                    |  4 +--
 pages/nongKe/cloud_entrepot/indexOther.vue |  3 +-
 pages/nongKe/statistics/index.vue          |  4 +--
 pages/product/basicSet.vue                 |  8 +++--
 pages/product/list/index.vue               |  6 ++--
 pages/users/order_list/indexCopy.vue       |  3 +-
 8 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/manifest.json b/manifest.json
index 6cd10e1..9080a17 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "惠农商户平台",
     "appid" : "__UNI__1EE148C",
     "description" : "",
-    "versionName" : "1.3.3",
-    "versionCode" : 133,
+    "versionName" : "1.3.4",
+    "versionCode" : 134,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 770eff6..ad2c263 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -48,9 +48,9 @@
       </view>
 
     </view>
-    <view class="content-open" v-if='!isshow' @click="open">
+   <!-- <view class="content-open" v-if='!isshow' @click="open">
       <image src="@/static/images/zk.png" mode="aspectFit"></image>
-    </view>
+    </view> -->
 
     <div v-if='isshow' style="margin-top: 80rpx;">
       <!-- // type=price&time=today&merId=1 -->
@@ -469,10 +469,16 @@
         }, {
           name: '暂存金额',
           value: 0
+        }, {
+          name: '补贴金额',
+          value: 0
         }, {
           name: '本月订单数',
           value: 0
-        }],
+        }, {
+          name: '今日订单数',
+          value: 0
+        },  ],
         order: [{
           name: '待付款',
           type: 1,
@@ -796,10 +802,17 @@
       }
     },
     onPullDownRefresh() {
-
-      this.getGoods(true).then(() => {
+      this.getGoods(true);
+      this.list1();
+      this.getUserInfo();
+      this.codelist();
+      this.$u.sleep(2000).then(() => {
         uni.stopPullDownRefresh()
-      })
+      });
+      this.$u.sleep(5000).then(() => {
+        this.loadEndFlag = true;
+      });
+      
     },
 
     async onLoad() {
@@ -1203,7 +1216,7 @@
             this.order[2].value = res.data.order.untake
             this.order[3].value = res.data.order.unevaluate
             this.order[4].value = res.data.order.refund
-            this.list[2].value = res.data.data.month.orderNum
+            this.list[3].value = res.data.data.month.orderNum
           },
           err => {
             that.$util.Tips({
@@ -2205,14 +2218,17 @@
     .content-middle {
       // padding: 0 30rpx;
       display: flex;
-      justify-content: space-around;
+      justify-content: flex-start;
+      flex-wrap: wrap;
       margin-top: 61rpx;
 
       .content-middlea {
         // width: 161rpx;
-        flex: 1;
+        // flex: 1;
+        width: 33.33%;
         flex-shrink: 0;
         text-align: center;
+        margin-bottom: 28rpx;
 
         .content-middlea-one {
           font-size: 26rpx;
@@ -2246,7 +2262,7 @@
     .content-bottom {
       background-color: #ffffff;
       border-radius: 32rpx 32rpx 0px 0px;
-      margin-top: 41rpx;
+      // margin-top: 41rpx;
       padding-top: 46rpx;
 
       .content-order {
diff --git a/pages/margin/margin.vue b/pages/margin/margin.vue
index d4493df..31ffed1 100644
--- a/pages/margin/margin.vue
+++ b/pages/margin/margin.vue
@@ -31,7 +31,7 @@
       </view>
     </view> -->
     
-    <u-tabs :list="[{name: '扣除记录'},{name: '充值记录'}]" @click="changeCurrent" lineColor="#f56c6c" :activeStyle="{
+    <u-tabs :list="[{name: '订单补缴记录'},{name: '充值记录'}]" @click="changeCurrent" lineColor="#f56c6c" :activeStyle="{
             color: '#333',
             fontWeight: 'bold',
             transform: 'scale(1.05)'
@@ -44,7 +44,7 @@
       <view class="content-order" v-for="(item,i ) in deductList">
       	<view class="deduct">扣除编号：{{item.financial_record_sn}}</view>
       	<view class="deduct">扣除金额：<text style="color: #ff5c2d;">{{item.number}}元</text></view>
-      	<view class="deduct">扣费方式：{{item.financial_type=='auto_margin'? '订单自动扣除': '其他扣除'}}</view>
+      	<view class="deduct">扣费方式：{{item.financial_type=='auto_margin'? '订单自动补缴': '其他扣除'}}</view>
       	<view class="deduct">订单编号：{{item.order_sn}}</view>
       	<view class="deduct">扣除时间：{{item.create_time}}</view>
       </view>
diff --git a/pages/nongKe/cloud_entrepot/indexOther.vue b/pages/nongKe/cloud_entrepot/indexOther.vue
index 92e635e..823548a 100644
--- a/pages/nongKe/cloud_entrepot/indexOther.vue
+++ b/pages/nongKe/cloud_entrepot/indexOther.vue
@@ -725,7 +725,8 @@
           page: this.storeParam.page,
           order: this.storeParam.order,
           // sys_labels: this.storeParam.sys_labels,
-          keyword: this.storeParam.keyword
+          keyword: this.storeParam.keyword,
+          category_id: this.userInfoData.mer_info.category_id,
         };
         if(this.storeParam.category_id==-1) null;
         else if(!this.merchantTow.pid) query.cate_pid = this.storeParam.category_id; // 全部是查询一级分类pid
diff --git a/pages/nongKe/statistics/index.vue b/pages/nongKe/statistics/index.vue
index 21238c9..d4af5e1 100644
--- a/pages/nongKe/statistics/index.vue
+++ b/pages/nongKe/statistics/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 
-		<view class="content-middle">
+		<!-- <view class="content-middle">
 			<view class="content-middlea" v-for="(item,index) in  list" :key='index' @click="handleToWithDraw(item, index)">
 				<view class="content-middlea-one">
 					{{item.name}}
@@ -10,7 +10,7 @@
 					{{item.value}}
 				</view>
 			</view>
-		</view>
+		</view> -->
 
 		<div style="margin-top: 80rpx;">
 			<view class="tools-one"
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index a402608..4838e16 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -32,12 +32,12 @@
 				<view class="zizhi_box">
 					<view class="text">店铺资质</view>
 					<block v-if="images[3].img">
-						<u--image :showLoading="true" @click="priviewImg([images[3].img])" :src="images[3].img" width="382.46rpx" height="210.53rpx"
+						<u--image :showLoading="true" @click="!imgUpload?priviewImg([images[3].img]):seleckImage(3)" :src="images[3].img" width="382.46rpx" height="210.53rpx"
 							radius="4px"></u--image>
 					</block>
-					<!-- <view v-else class="zizhi_img" @click="seleckImage(3)">
+					<view v-else class="zizhi_img" @click="seleckImage(3)">
 						<view class="iconfont icon-tupian1"></view>
-					</view> -->
+					</view>
 				</view>
 			</view>
       <view class="store_avatar flex_a_c_j_sb" style="padding: 20rpx 0;" v-if="imagesArr.length>0">
@@ -240,6 +240,7 @@
 				}, {
 					img: ''
 				}],
+        imgUpload: true, // 是否可以上传店铺资质
         imagesArr: [],
 				storeBg: '',
 				check: {
@@ -326,6 +327,7 @@
             res.data.mer_certificate.shift();
             this.imagesArr = res.data.mer_certificate;
           }else this.images[3].img = res.data.mer_certificate;
+          if(this.images[3].img) this.imgUpload = false;
 				  if(typeof res.data.delivery_way == 'string') this.delivery_way = res.data.delivery_way.split(',');
 					else this.delivery_way = res.data.delivery_way;
 					this.delivery_way.forEach(item => {
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index b74ad9d..104229e 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -861,11 +861,11 @@
 
 		margin-top: 20rpx;
 		background-color: #ffffff;
-		height: 220rpx;
+		// height: 220rpx;
+    padding: 10rpx 0;
 		border-radius: 12px;
 		z-index: 10;
 		box-shadow: 0 0 7px #a3a3a3;
-		padding-top: 20rpx;
 
 		.muau {
 
@@ -873,7 +873,7 @@
 			width: 160rpx;
 			text-align: center;
 
-			margin-top: 20rpx;
+			margin: 10rpx 0;
 
 			view:hover {
 				color: red
diff --git a/pages/users/order_list/indexCopy.vue b/pages/users/order_list/indexCopy.vue
index 6c13edf..c0de04f 100644
--- a/pages/users/order_list/indexCopy.vue
+++ b/pages/users/order_list/indexCopy.vue
@@ -586,7 +586,8 @@
 				getOrderData: function() {
 					let that = this;
 					orderData({
-						product_type: this.product_type
+						product_type: this.product_type,
+            source: 11
 					}).then(res => {
 						// console.log(res.data)
 						that.$set(that, 'orderData', res.data);