From 1da1b052e60c82d54bed51a54ca449fa8e31f87e Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Thu, 7 Sep 2023 17:09:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E6=98=93=E5=A4=A7=E5=8E=85=20?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E5=BC=B9=E7=AA=97=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20=E5=95=86=E5=93=81=E5=85=A5=E5=BA=93=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E6=8A=A5=E9=94=99=E5=A4=84=E7=90=86=20=E5=A7=94?=
 =?UTF-8?q?=E6=89=98=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/WaterfallsFlow/WaterfallsFlows.vue |  29 +++--
 .../WaterfallsFlowItems.vue                   |  26 ++--
 components/realselist/realselist.vue          |   5 +-
 components/shoppinglist/shoppinglist.vue      |  33 ++---
 components/subtractive/subtractive.vue        |  10 +-
 pages.json                                    |  12 ++
 .../delegation_details/index.vue              |   3 +-
 .../initiateDelegation/index.vue              | 119 +++++++++---------
 .../receivedCommission/index.vue              |  40 ++++--
 pages/index/index.vue                         |   3 +-
 pages/moreProject/moreProject.vue             |  30 ++++-
 pages/order_details/index.vue                 |  21 +++-
 pages/product/basicSet.vue                    |  30 +++--
 pages/product/list/index.vue                  |  10 +-
 pages/supply_chains/supply_chains.vue         |   1 +
 pages/trading_hall/transfer_goods/index.vue   |   2 +-
 pages/users/online_warehousing/index.vue      |   2 +-
 17 files changed, 217 insertions(+), 159 deletions(-)

diff --git a/components/WaterfallsFlow/WaterfallsFlows.vue b/components/WaterfallsFlow/WaterfallsFlows.vue
index e954156..e5f9b95 100644
--- a/components/WaterfallsFlow/WaterfallsFlows.vue
+++ b/components/WaterfallsFlow/WaterfallsFlows.vue
@@ -2,13 +2,12 @@
     <view :class="'wf-page wf-page'+type">
         <!--    left    -->
 		
-		
         <view>
 		
             <view id="left" v-if="leftList.length">
                 <view v-for="(item,index) in leftList" :key="index"
                       class="wf-itema" @tap="itemTap(item)">
-                    <WaterfallsFlowItem :item="item" :isStore="isStore" :type="type" @goShop="goShop"/>
+                    <WaterfallsFlowItem :item="item" :isStore="isStore" :userid='userid' :type="type" @goShop="goShop"/>
                 </view>
             </view>
         </view>
@@ -17,7 +16,7 @@
             <view id="right" v-if="rightList.length">
                 <view v-for="(item,index) in rightList" :key="index"
                       class="wf-itemb" @tap="itemTap(item)">					  
-                    <WaterfallsFlowItem :item="item" :isStore="isStore" :type="type" @goShop="goShop"/>
+                    <WaterfallsFlowItem :item="item" :isStore="isStore" :userid='userid' :type="type" @goShop="goShop"/>
                 </view>
             </view>
         </view>
@@ -26,7 +25,9 @@
 
 <script>
 import WaterfallsFlowItem from '../WaterfallsFlowItem/WaterfallsFlowItems.vue'
-	
+	import {
+		getUserInfo
+	} from '@/api/user.js';
 export default {
     components: {
         WaterfallsFlowItem
@@ -57,6 +58,7 @@ export default {
             rightList: [],     // 右边列表
             mark: 0,           // 列表标记
             boxHeight: [],     // 下标0和1分别为左列和右列高度
+			userid:'',
         };
     },
     watch: {
@@ -107,10 +109,7 @@ export default {
 			immediate: true,
 			deep:true
         },
-		mounted(){
-			this.getUserInfo()
-		},
-
+		
         // 监听标记，当标记发生变化，则执行下一个item排序
         mark() {
             const len = this.allList.length;
@@ -119,9 +118,19 @@ export default {
             }
         }
     },
-	
+	mounted(){
+		this.getUserInfo()
+	},
     methods: {
-		
+		/**
+		 * 获取个人用户信息
+		 */
+		getUserInfo(){
+		getUserInfo().then(res => {
+			this.userid = res.data.uid
+		});	
+		},
+	
         // 瀑布流排序
         waterFall() {
             const i = this.mark;
diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItems.vue b/components/WaterfallsFlowItem/WaterfallsFlowItems.vue
index a30a5c5..c648c9a 100644
--- a/components/WaterfallsFlowItem/WaterfallsFlowItems.vue
+++ b/components/WaterfallsFlowItem/WaterfallsFlowItems.vue
@@ -16,15 +16,16 @@
 </template>
 
 <script>
-	import {
-		getUserInfo
-	} from '@/api/user.js';
 	export default {
 		props: {
 			item: {
 				type: Object,
 				require: true
-			}
+			},
+			userid: {
+				type: String|Number,
+				require: true
+			},
 		},
 
 
@@ -35,28 +36,17 @@
 			}
 		},
 
-		mounted() {
-			this.getUserInfo()
-		},
 
 		methods: {
-			/**
-			 * 获取个人用户信息
-			 */
-			getUserInfo: function() {
-				let that = this;
-				getUserInfo().then(res => {
-					this.user_id = res.data.uid
-				});
-			},
+
 			gogogo(item) {
 				if (item.video_link.length > 0) {
 					uni.navigateTo({
 						// #ifdef MP || H5
-						url: `/pages/short_video/nvueSwiper/index?id=${item.community_id}&uid=${this.user_id}&user=1`
+						url: `/pages/short_video/nvueSwiper/index?id=${item.community_id}&uid=${this.userid}&user=1`
 						// #endif
 						// #ifdef APP
-						url: `/pages/short_video/appSwiper/index?id=${item.community_id}&uid=${this.user_id}&user=1`
+						url: `/pages/short_video/appSwiper/index?id=${item.community_id}&uid=${this.userid}&user=1`
 						// #endif
 					})
 				} else {
diff --git a/components/realselist/realselist.vue b/components/realselist/realselist.vue
index 6f5053e..47ee770 100644
--- a/components/realselist/realselist.vue
+++ b/components/realselist/realselist.vue
@@ -61,12 +61,12 @@
 								<view class="price_num">
 									<span>委托数量</span>
 									<subtractive v-if='item.number==0' style="margin-top: 10rpx;margin-left: 20rpx;"
-										class="step" :min="1" :max="item.attrValue[index].stock" :value="peicenumber"
+										class="step" :min="0" :max="item.attrValue[index].stock" :value="peicenumber"
 										:isMax="true" :isMin="true" index="11" @eventChange="numberChange($event,i)">
 									</subtractive>
 
 									<subtractive v-else style="margin-top: 10rpx;margin-left: 20rpx;" class="step"
-										:min="1" :max="item.attrValue[index].stock" :value="item.number" :isMax="true"
+										:min="0" :max="item.attrValue[index].stock" :value="item.number" :isMax="true"
 										:isMin="true" index="11" @increment="incrementTotal($event,i,item)"
 										@eventChange="numberChange($event,i)"></subtractive>
 								</view>
@@ -288,6 +288,7 @@
 							that.$set(item, 'check', true);
 							that.$set(item, 'number', val.number);
 							that.$set(item, 'price', val.price);
+							that.peicenumber=val.number
 						}
 					})
 				})
diff --git a/components/shoppinglist/shoppinglist.vue b/components/shoppinglist/shoppinglist.vue
index f578055..24de335 100644
--- a/components/shoppinglist/shoppinglist.vue
+++ b/components/shoppinglist/shoppinglist.vue
@@ -61,12 +61,12 @@
 								<view class="price_num">
 									<span>出售数量</span>
 									<subtractive v-if='item.number==0' style="margin-top: 10rpx;margin-left: 20rpx;"
-										class="step" :min="1" :max="item.attrValue[index].stock" :value="peicenumber"
+										class="step" :min="0" :max="item.attrValue[index].stock" :value="peicenumber"
 										:isMax="true" :isMin="true" index="11" @eventChange="numberChange($event,i)">
 									</subtractive>
 
 									<subtractive v-else style="margin-top: 10rpx;margin-left: 20rpx;" class="step"
-										:min="1" :max="item.attrValue[index].stock" :value="item.number" :isMax="true"
+										:min="0" :max="item.attrValue[index].stock" :value="item.number" :isMax="true"
 										:isMin="true" index="11" @increment="incrementTotal($event,i,item)"
 										@eventChange="numberChange($event,i)"></subtractive>
 								</view>
@@ -177,6 +177,7 @@
 				for (let i in this.checkedArr) {
 					if (this.checkedArr[i].product_id == item.product_id) {
 						this.checkedArr.splice(i, 1)
+						
 					}
 				}
 
@@ -184,6 +185,7 @@
 
 			},
 			incrementTotal(e, i, item) {
+				// console.log(e, i, item)
 				this.$set(item, 'check', false);
 				for (let i in this.checkedArr) {
 					if (this.checkedArr[i].product_id == item.product_id) {
@@ -202,7 +204,6 @@
 				this.bought[num].attrValue[this.index].stock = storage[e.detail.value].stock
 				this.bought[num].product_attr_unique = storage[e.detail.value].unique
 				this.pickerData = storage[this.index] // 这里就是选中的对象
-
 				if (this.bought[num].attrValue[this.index].stock == 0) {
 					this.$util.Tips({
 						title: '库存不足'
@@ -288,6 +289,7 @@
 							that.$set(item, 'check', true);
 							that.$set(item, 'number', val.number);
 							that.$set(item, 'price', val.price);
+							that.peicenumber=val.number
 						}
 					})
 				})
@@ -306,6 +308,7 @@
 			goodsCheck(item) {
 				this.$set(item, 'check', !item.check);
 				if (item.check) {
+					
 					if (this.peicenumber == 0) {
 						item.number = 1
 					}
@@ -313,34 +316,12 @@
 						item.product_attr_unique = item.attrValue[0].unique
 					}
 					this.checkedArr.push(item)
-					this.arrayUnique(this.checkedArr, 'product_id')
 				} else {
 					this.checkedArr.splice(this.checkedArr.findIndex(itemn => ((itemn.product_id == item.product_id))), 1)
 
 				}
 			},
-			//去重
-			arrayUnique(arr, name) {
-				let hash = {}
-				const result = arr.reduce((acc, cru, index) => {
-					if (!hash[cru[name]]) {
-						hash[cru[name]] = {
-							index: acc.length
-						}
-						acc.push(cru)
-					} else {
-						console.log(acc, hash[cru[name]])
-						acc.splice(hash[cru[name]]['index'], 1, cru)
-					}
-
-
-					return acc;
-
-				}, [])
-				this.checkedArr = result
-
-
-			},
+			
 			/*确定提交*/
 			submit() {
 
diff --git a/components/subtractive/subtractive.vue b/components/subtractive/subtractive.vue
index 153637f..e6c988d 100644
--- a/components/subtractive/subtractive.vue
+++ b/components/subtractive/subtractive.vue
@@ -94,6 +94,10 @@
 					}
 					if (newValue < this.min) {
 						newValue = this.min
+						this.$util.Tips({
+							title: '达到最小值了',
+							icon: 'error'
+						})
 					}
 					if (newValue < this.max && this.maxDisabled === true) {
 						this.maxDisabled = false;
@@ -104,6 +108,10 @@
 						this.maxDisabled = true;
 					}
 					if (newValue > this.max) {
+						this.$util.Tips({
+							title: '达到最大值了',
+							icon: 'error'
+						})
 						newValue = this.max
 					}
 					if (newValue > this.min && this.minDisabled === true) {
@@ -114,7 +122,7 @@
 					return;
 				}
 				this.inputValue = newValue / scale;
-				this.$emit('increment',this.inputValue)
+				this.$emit('increment', this.inputValue)
 			},
 			_getDecimalScale() {
 				let scale = 1;
diff --git a/pages.json b/pages.json
index 13752f3..45db4e9 100644
--- a/pages.json
+++ b/pages.json
@@ -565,6 +565,12 @@
 						"navigationBarTitleText": "采购订单"
 					}
 				},
+				{
+					"path": "order_list/relase",
+					"style": {
+						"navigationBarTitleText": "委托订单"
+					}
+				},
 				{
 					"path": "order_list/order",
 					"style": {
@@ -968,7 +974,13 @@
 					"style": {
 						"navigationBarTitleText": "订单列表"
 					}
+				},{
+					"path": "financial_management/index",
+					"style": {
+						"navigationBarTitleText": "财务管理"
+					}
 				},
+				
 				{
 					"path": "orderRefund/index",
 					"style": {
diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue
index 0bd7f4f..3be7fef 100644
--- a/pages/commissionedSales/delegation_details/index.vue
+++ b/pages/commissionedSales/delegation_details/index.vue
@@ -6,7 +6,7 @@
 			</view>
 			<view class="content_top-two">
 				<view class="top-two-one">
-					待评价
+					待处理
 				</view>
 				<view class="top-two-two">
 					2020-07-07 14:14:14
@@ -186,6 +186,7 @@
 				font-weight: 500;
 				color: #FFFFFF;
 				margin-top: 10rpx;
+				
 			}
 
 			.top-two-two {
diff --git a/pages/commissionedSales/initiateDelegation/index.vue b/pages/commissionedSales/initiateDelegation/index.vue
index e066e04..edc0f73 100644
--- a/pages/commissionedSales/initiateDelegation/index.vue
+++ b/pages/commissionedSales/initiateDelegation/index.vue
@@ -6,7 +6,7 @@
 			<cxNavTitle :tabs="tabs" :activeItem="activeItem" @tabClick="tabClick" :show='false'></cxNavTitle>
 		</view>
 		<!-- 审核通过 打折的拒绝、同意功能 ，调货不需要功能 -->
-		<view class="content-content" v-for="(item,i) in list" :key="i">
+		<view class="content-content" v-for="(item,i) in orderList" :key="i">
 
 			<view class="content-one">
 				<view class="content-one-img">
@@ -25,73 +25,63 @@
 
 
 			<view class="content-two_one" v-if="item.type==1">
-
-				<view class="content-two-edita" @click="soldEdit">
+				<view class="content-two-edita">
 					待处理
 				</view>
-
 				<view class="contentgn">
-					<view class="contentgn_a">
+					<view class="contentgn_a" @click="soldEdit(item)">
 						处理
 					</view>
 					<span></span>
+					<view class="contentgn_b" @click="detaildetail(item)">
+						详情
+					</view>
+				</view>
+			</view>
+			<view class="content-two_oneq" v-if="item.type==2">
+				<view class="content-two-editb" @click="accepted">
+					已接受
+				</view>
+				<view class="contentgn">
+					<view class="contentgn_a" @click="closingorder">
+						结束委托
+					</view>
+					<span></span>
 					<view class="contentgn_b" @click="detail">
 						详情
 					</view>
 				</view>
 			</view>
-			<view class="content-two_oneq" v-if="item.type==2">
-
-
-				<view class="content-two-editb" @click="accepted">
-					已接受
-				</view>
-
-				<view class="contentgn">
-					<view class="contentgn_a" @click="closingorder">
-						结束委托
-					</view>
-					<span></span>
-					<view class="contentgn_b">
-						详情
-					</view>
-				</view>
-			</view>
 			<view class="content-two_one" v-if="item.type==3">
-
-
 				<view class="content-two-editc" @click="declined">
 					已拒绝
 				</view>
 				<view class="contentgn">
-					<view class="contentgn_a">
+					<view class="contentgn_a" click="deleteOrder(item)">
 						删除
 					</view>
 					<span></span>
-					<view class="contentgn_b">
+					<view class="contentgn_b" @click="detail(item)">
 						详情
 					</view>
 				</view>
 			</view>
 			<view class="content-two_one" v-if="item.type==4">
-
-
 				<view class="content-two-editd" @click="soldEdit">
 					已完成
 				</view>
 				<view class="contentgn">
-					<view class="contentgn_a">
+					<view class="contentgn_a" click="deleteOrder(item)">
 						删除
 					</view>
 					<span></span>
-					<view class="contentgn_b">
+					<view class="contentgn_b" @click="detail(item)">
 						详情
 					</view>
 				</view>
 			</view>
 		</view>
-		<view class="adddelegation"  @click="addDelegation">
-
+		<view class="adddelegation" @click="addDelegation">
 			<view class="adddelegation-one">
 				<image src="@/static/images/delegation.png" mode=""></image>
 			</view>
@@ -99,9 +89,10 @@
 				新增委托
 			</view>
 		</view>
-		<view v-if="orderList.length == 0 && this.where.page > 1">
+		<view v-if="orderList.length == 0">
 			<emptyPage title="暂无订单~"></emptyPage>
 		</view>
+		<u-loadmore :status="status" v-if="orderList.length >= where.limit" />
 		<uni-popup ref="bindmobile" type="center" @click="close">
 
 			<view class="" style="position: relative;">
@@ -116,13 +107,10 @@
 							</view>
 							<view class="bg-content-b">
 								结算周期: <span>30天</span>
-
-
 							</view>
 							<view class="bg-content-c">
 								利息比例: <span>0.05%</span>
 							</view>
-
 							<view class="entrust_bga_btn">
 								<view class="cancellation">
 									拒绝
@@ -137,7 +125,6 @@
 			</view>
 		</uni-popup>
 		<uni-popup ref="bindmobile1" type="center" @click="close">
-
 			<view class="" style="position: relative;">
 				<view class="entrust">
 					<view class="entrust_close" @click="close">
@@ -157,15 +144,11 @@
 								</view>
 							</view>
 						</view>
-
 					</view>
-
 				</view>
-
 			</view>
 		</uni-popup>
 		<uni-popup ref="bindmobile2" type="center" @click="close">
-
 			<view class="" style="position: relative;">
 				<view class="entrust">
 					<view class="entrust_close" @click="close">
@@ -178,13 +161,10 @@
 							</view>
 							<view class="bg-content-b">
 								结算周期: <span>30天</span>
-
-
 							</view>
 							<view class="bg-content-c">
 								利息比例: <span>0.05%</span>
 							</view>
-
 							<view class="entrust_bga_btn">
 								<view class="cancellation">
 									拒绝
@@ -212,20 +192,15 @@
 							</view>
 							<view class="bg-content-b">
 								结算周期: <span>30天</span>
-
-
 							</view>
 							<view class="bg-content-c">
 								利息比例: <span>0.05%</span>
 							</view>
 							<view class="bg-content-c">
-
 								拒绝原因：
 								<view class="" style="margin-top: 21rpx;">
-
 									<textarea value="" placeholder="输入拒绝原因" class="bg-content_textarea" />
 								</view>
-
 							</view>
 							<view class="entrust_bga_btn">
 								<view class="determine">
@@ -243,7 +218,7 @@
 <script>
 	import cxNavTitle from '@/components/cx-navTitle.vue'
 	import emptyPage from '@/components/emptyPage.vue';
-		import {} from '@/api/sale.js'
+	import {} from '@/api/sale.js'
 	export default {
 		components: {
 			cxNavTitle,
@@ -252,6 +227,7 @@
 		data() {
 			return {
 				activeItem: "tabOne",
+				status: 'loadmore',
 				tabTitle: "",
 				orderList: [],
 				where: {
@@ -312,25 +288,45 @@
 
 		},
 		methods: {
+			onReachBottom() {
+				if (this.status == 'nomore') return;
+				this.status = 'loading';
+				this.where.page = ++this.where.page;
+				this.commislist()
+			},
 			nav(item) {
 				// uni.navigateTo({
 				// 	url: '/pages/commissionedSales/delegation_details/index'
 				// })
 			},
 			//获取分类数据
-			commislist(){
-				
+			commislist() {
+				// console.log('111111')
 			},
-			
+
 			//选择
 			tabClick(e) { //点击获取当前标签数据 
 				this.activeItem = e.name; //当前class类名 
 				this.tabTitle = e.name; //当前选的标签名
+
+				if (this.tabTitle = "tabOne") {
+					this.where.page = 1
+					this.orderList = []
+					this.commislist()
+				} else if (this.tabTitle = "tabTwo") {
+					this.where.page = 1
+					this.orderList = []
+					this.commislist()
+				} else {
+					this.where.page = 1
+					this.orderList = []
+					this.commislist()
+				}
 			},
 			//新增委托
-			addDelegation(){
+			addDelegation() {
 				uni.navigateTo({
-					url:'/pages/commissionedSales/addDelegation/index'
+					url: '/pages/commissionedSales/addDelegation/index'
 				})
 			},
 			//管理弹窗
@@ -354,17 +350,22 @@
 			},
 			//已接受
 			accepted() {
-				this.$refs.bindmobile1.open()
+
 			},
 			//结束委托
 			closingorder() {
-				this.$refs.bindmobile3.open()
+				this.$refs.bindmobile1.open()
+				// this.$refs.bindmobile3.open()
 			},
 			// 已拒绝
 			declined() {
-				this.$refs.bindmobile2.open()
+				// this.$refs.bindmobile2.open()
+				this.$refs.bindmobile3.open()
 			},
+			//删除订单
+			deleteOrder(item) {
 
+			},
 			// 审核未通过 编辑
 			auditEdit() {
 
@@ -385,7 +386,7 @@
 	.content {
 		height: 100vh;
 		position: relative;
-		
+
 	}
 
 	.content_top {
diff --git a/pages/commissionedSales/receivedCommission/index.vue b/pages/commissionedSales/receivedCommission/index.vue
index 4009e74..40d36ef 100644
--- a/pages/commissionedSales/receivedCommission/index.vue
+++ b/pages/commissionedSales/receivedCommission/index.vue
@@ -5,7 +5,7 @@
 			<!--选项卡滑动切换-->
 			<cxNavTitle :tabs="tabs" :activeItem="activeItem" @tabClick="tabClick" :show='false'></cxNavTitle>
 		</view>
-	
+
 		<view class="content-content" v-for="(item,i) in list" :key="i" @click="nav(item)">
 
 			<view class="content-one">
@@ -23,7 +23,7 @@
 			</view>
 
 			<view class="content-two_one" v-if="item.type==1">
-				<view class="content-two-edita" @click="soldEdit">
+				<view class="content-two-edita" @click="soldEdit(item)">
 					待处理
 				</view>
 				<view class="contentgn">
@@ -37,8 +37,6 @@
 				</view>
 			</view>
 			<view class="content-two_oneq" v-if="item.type==2">
-
-
 				<view class="content-two-editb" @click="accepted">
 					已接受
 				</view>
@@ -54,8 +52,6 @@
 				</view>
 			</view>
 			<view class="content-two_one" v-if="item.type==3">
-
-
 				<view class="content-two-editc" @click="declined">
 					已拒绝
 				</view>
@@ -87,9 +83,10 @@
 			</view>
 		</view>
 
-		<view v-if="orderList.length == 0 && this.where.page > 1">
+		<view v-if="orderList.length == 0">
 			<emptyPage title="暂无订单~"></emptyPage>
 		</view>
+		<u-loadmore :status="status" v-if="orderList.length >= where.limit" />
 		<uni-popup ref="bindmobile" type="center" @click="close">
 
 			<view class="" style="position: relative;">
@@ -239,6 +236,8 @@
 		},
 		data() {
 			return {
+				activeItem: "tabOne",
+				status: 'loadmore',
 				activeItem: "tabOne",
 				tabTitle: "",
 				orderList: [],
@@ -300,18 +299,43 @@
 
 		},
 		methods: {
+			onReachBottom() {
+				if (this.status == 'nomore') return;
+				this.status = 'loading';
+				this.where.page = ++this.where.page;
+				this.commislist()
+			},
 			nav(item) {
 				uni.navigateTo({
 					url: '/pages/commissionedSales/delegation_details/index'
 				})
 			},
+			//获取分类数据
+			commislist() {
+				console.log('111111')
+			},
+
+			//选择
 			tabClick(e) { //点击获取当前标签数据 
 				this.activeItem = e.name; //当前class类名 
 				this.tabTitle = e.name; //当前选的标签名
+				if (this.tabTitle = "tabOne") {
+					this.where.page = 1
+					this.orderList = []
+					this.commislist()
+				} else if (this.tabTitle = "tabTwo") {
+					this.where.page = 1
+					this.orderList = []
+					this.commislist()
+				} else {
+					this.where.page = 1
+					this.orderList = []
+					this.commislist()
+				}
 			},
 			//管理弹窗
 			close() {
-				console.log('1111111')
+				
 				this.$refs.bindmobile.close()
 				this.$refs.bindmobile1.close()
 				this.$refs.bindmobile2.close()
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 86bccf5..3c4a503 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -13,7 +13,7 @@
 						<view :class="['iconfont', 'icon-xiaoxi', isFshow ? 'sitebox' : '']" style="color: #000"></view>
 					</navigator>
 				</view>
-				<!-- <view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
+				<!--<view class="site-box ','flex_a_c_j_sb'" v-if="ishshow">
 					<view class="bg-img">
 						<img :src="bgColor" alt="">
 					</view>
@@ -224,7 +224,6 @@
 			this.$bus.$on('value-updated', (newValue) => {
 				// 更新父组件的值 
 				this.street = newValue.split(',')[0]
-
 			});
 		},
 		// #ifdef APP-PLUS
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 9c098a5..08d4ef3 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -15,6 +15,16 @@
 							<image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image>
 							<text class="text">财务管理</text>
 						</view>
+						<!-- 	<view class="examine"
+							@click="navigator(`/pages/admin/financial_management/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
+							<image class="icon_img" :src="`${prefix}cwgl.png`" mode="aspectFill"></image>
+							<text class="text">财务管理</text>
+						</view>
+						<view class="examine"
+							@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&product_type=98&type_id=${userInfoData.mer_info.type_id}`)">
+							<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill"></image>
+							<text class="text">订单管理</text>
+						</view> -->
 						<view class="examine"
 							@click="navigator(`/pages/nongKe/gather/select_warehouse?mer_id=${mer_id}&stype=1`)">
 							<image class="icon_img" :src="`${prefix}rkgl.png`" mode="aspectFill">
@@ -62,7 +72,8 @@
 				</view>
 			</view>
 
-			<view class="business com" v-if="userInfoData.mer_info.type_code === 'TypeStore'">
+			<view class="business com"
+				v-if="userInfoData.mer_info.type_code === 'TypeStore'||userInfoData.mer_info.type_code === 'TypeTownSupplyChain'">
 				<view class="business com" v-if="true">
 					<view class="special_work com">
 						<view class="title">我的店铺</view>
@@ -124,7 +135,7 @@
 								</image>
 								<text class="text">商户设置</text>
 							</view>
-					      <!-- <view class="examine"
+						<!-- 	<view class="examine"
 								@click="navigator(`/pages/users/trading_hall/index?mer_id=${mer_id}`)">
 								<image class="icon_img" src="@/static/images/diaohuo.png" mode="aspectFill">
 								</image>
@@ -140,6 +151,12 @@
 								<image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill">
 								</image>
 								<text class="text">发布管理</text>
+							</view>
+
+							<view class="examine" @click="navigator(`/pages/users/order_list/relase?mer_id=${mer_id}&status=-1`)">
+								<image class="icon_img" src="@/static/images/relase.png" mode="aspectFill">
+								</image>
+								<text class="text">委托订单</text>
 							</view> -->
 							<!-- <view class="examine" @click="navigator(`/pages/users/user_invoice_Finance/index?mer_id=${mer_id}`)">
 							<image class="icon_img" src="@/static/images/cwgk.png" mode="aspectFill">
@@ -226,12 +243,13 @@
 				</view>
 			</view>
 
-<view class="business com" v-if="userInfoData.mer_info.type_code === 'TypeFeaturedCultural'|| userInfoData.mer_info.type_code === 'TypeFamousSpecialties'|| userInfoData.mer_info.type_code === 'TypeLocalCuisine' ">
+			<view class="business com"
+				v-if="userInfoData.mer_info.type_code === 'TypeFeaturedCultural'|| userInfoData.mer_info.type_code === 'TypeFamousSpecialties'|| userInfoData.mer_info.type_code === 'TypeLocalCuisine' ">
 				<view class="business com" v-if="true">
 					<view class="special_work com">
 						<view class="title">我的店铺</view>
 						<view class="content ">
-						
+
 							<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
 								<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
 								</image>
@@ -272,7 +290,7 @@
 				</view>
 			</view>
 
-  
+
 		</block>
 		<!-- <m-tabbar native>
       <template v-slot:tabbar_index_2>
@@ -362,7 +380,7 @@
 		},
 		mounted() {
 			this.appLocation()
-			
+
 
 
 		},
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 6840bea..bafa280 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -21,10 +21,11 @@
 			<view v-else>
 				<view class='header acea-row row-middle' :class='isGoodsReturn ? "on":""'>
 					<view class='pictrue' v-if="isGoodsReturn==false">
-					
-						<image v-if="orderInfo.status != 9&&orderInfo.status !=12" :src="imgUrl+'/static/order_'+(orderInfo.status+2)+'.gif'">
+
+						<image v-if="orderInfo.status != 9&&orderInfo.status !=12"
+							:src="imgUrl+'/static/order_'+(orderInfo.status+2)+'.gif'">
 						</image>
-					
+
 						<image v-else :src="imgUrl+'/static/order_2.gif'"></image>
 					</view>
 					<view class='data' :class='isGoodsReturn ? "on":""'>
@@ -60,10 +61,18 @@
 							<view :class="orderInfo.order_status == 5 ? 'on':''">已完成</view>
 						</view>
 						<view class='progress acea-row row-between-wrapper'>
-							<view class='iconfont icon-webicon318 t-color'
-								v-if=" orderInfo.order_status == 8||orderInfo.order_status == 9||orderInfo.order_status == 1">
+							<view
+								v-if="orderInfo.order_status == 8||orderInfo.order_status == 9||orderInfo.order_status == 1">
+								<view class='iconfont icon-webicon318 t-color'>
+								</view>
+								<view class='iconfont t-color'></view>
 							</view>
-							<view class='iconfont t-color' else></view>
+							<view class="" v-else>
+								<view class='iconfont icon-yuandianxiao t-color'>
+								</view>
+								<view class='iconfont t-color'></view>
+							</view>
+
 							<view class='line b-color'></view>
 							<view class='iconfont'
 								:class='((orderInfo.status == 0 || orderInfo.status == 9||orderInfo.order_status == 2) ? "icon-webicon318":"icon-yuandianxiao") + " " + (orderInfo.status >= 0 ? "t-color":"")'>
diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue
index cef4cd9..697834b 100644
--- a/pages/product/basicSet.vue
+++ b/pages/product/basicSet.vue
@@ -108,10 +108,12 @@
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>店铺营业时间:</view>
 				<view class="bus_time flex_a_c">
 					<view class="select" @click="beginTimeShow = true">
-						{{ mer_take_time[0] ? mer_take_time[0] : '选择开始时间' }}</view>
+						{{ mer_take_time[0] ? mer_take_time[0] : '选择开始时间' }}
+					</view>
 					至
 					<view class="select" @click="overTimeShow = true">
-						{{ mer_take_time[1] ? mer_take_time[1] : '选择结束时间' }}</view>
+						{{ mer_take_time[1] ? mer_take_time[1] : '选择结束时间' }}
+					</view>
 				</view>
 			</block>
 		</view>
@@ -132,12 +134,13 @@
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>客服电话：</view>
 				<input class="com_input" type="number" v-model="servicePhone" placeholder="输入客服电话">
 			</view>
-			
-			<view class="item_cell flex_a_c" v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'" >
+
+			<view class="item_cell flex_a_c"
+				v-if="type_code!='TypeFamousSpecialties'||type_code!='TypeLocalCuisine'||type_code!='TypeFeaturedCultural'">
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao" v-if="credit_buy"></i>开启先货后款：</view>
 				<u-switch v-model="credit_buy" @change="change"></u-switch>
 			</view>
-			<view class="item_cell flex_a_c"  v-if="credit_buy">
+			<view class="item_cell flex_a_c" v-if="credit_buy">
 				<view class="sub_title flex_a_c"><i class="iconfont icon-xinghao"></i>先货后款结算周期：</view>
 				<input type="number" v-model="settle_cycle" placeholder="请输入 /周期单位为:天">
 			</view>
@@ -267,8 +270,8 @@
 				credit_buy: false, //开启信用购
 				interest_rate: '', //利率
 				settle_cycle: '', //周期
-				mer_name:'',
-				type_code:''
+				mer_name: '',
+				type_code: ''
 			}
 		},
 		onLoad(e) {
@@ -281,7 +284,7 @@
 				merchantInfoAPI({
 					id
 				}).then(res => {
-					console.log(res);
+
 					this.images[0].img = res.data.mer_banner
 					this.images[1].img = res.data.mer_avatar
 					this.images[2].img = res.data.mini_banner
@@ -294,15 +297,16 @@
 					this.takeName = res.data.mer_take_name
 					this.takePhone = res.data.mer_take_phone
 					this.detailSite = res.data.mer_take_address
-					this.longLati = res.data.mer_take_location.join(',') ?? ''
-					res.data.mer_take_day.forEach((item, i) => {
+					this.longLati = res.data.mer_take_location.length > 0 ? res.data.mer_take_location.join(',') :
+						''
+					res.data.mer_take_day.length > 0 ? res.data.mer_take_day.forEach((item, i) => {
 						this.dateWeek[Number(item) - 1].isCheck = true
-					})
-					this.type_code= res.data.type_code
+					}) : ''
+					this.type_code = res.data.type_code
 					this.mer_take_time = res.data.mer_take_time
 					this.intro = res.data.mer_info
 					this.cruxText = res.data.mer_keyword
-					this.mer_name= res.data.mer_name
+					this.mer_name = res.data.mer_name
 					this.servicePhone = res.data.service_phone
 					this.mer_address = res.data.mer_address
 					this.merState = res.data.mer_state === 1 ? true : false
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index 9b1edd8..ce17901 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -133,7 +133,7 @@
           </scroll-view>
         </view>
         <view class="shuru" v-if="this.on_line == 1">
-          数量: <input type="number" v-model="data.number" placeholder="请输入">
+          数量: <input type="number"  v-model="data.number" placeholder="请输入">
         </view>
         <view class="btn">
           <button class="btn_l" @click="close()">取消</button>
@@ -207,13 +207,13 @@
         //线下
         show: false,
         //单选示例
-        checkboxValue1: [],
+        checkboxValue1: '',
         // 基本案列数据
         checkboxList1: [],
         data: {
           product_id: '',
           unique: "",
-          number: 1
+          number:1
         },
         on_line: ''
       }
@@ -240,7 +240,7 @@
         }
         this.on_line = action
         this.checkboxList1 = rowId
-        console.log(this.on_line);
+    
         if (this.checkboxList1.length == 1 && action == 0) {
           // this.show = true
           navigateTo(1, '/pages/users/online_warehousing/index', {
@@ -316,7 +316,7 @@
       },
       radioChange(n) {
         this.data.product_id = n.product_id
-        console.log(this.data);
+        // console.log(this.data);
       },
       // 跳转添加商品界面
       jumpAddGoods() {
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index a0ad5b1..77c8224 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -865,6 +865,7 @@
 		margin-top: -10rpx;
 		padding: 12rpx;
 
+
 		.list-con-left {
 			width: 357rpx;
 			height: 482rpx;
diff --git a/pages/trading_hall/transfer_goods/index.vue b/pages/trading_hall/transfer_goods/index.vue
index 0bd4f99..895a38c 100644
--- a/pages/trading_hall/transfer_goods/index.vue
+++ b/pages/trading_hall/transfer_goods/index.vue
@@ -619,7 +619,7 @@
 
 				this.productList = []
 				this.price = 0;
-				console.log(data)
+		
 				if (data.length > 0) {
 					this.productList = data;
 					for (let i in data) {
diff --git a/pages/users/online_warehousing/index.vue b/pages/users/online_warehousing/index.vue
index 8e4b81b..75bfcaf 100644
--- a/pages/users/online_warehousing/index.vue
+++ b/pages/users/online_warehousing/index.vue
@@ -164,7 +164,7 @@
 				if (this.loading || this.loaded) return;
 				this.loading = true;
 				getOrderList(this.where, this.mer_id).then(res => {
-					console.log(res);
+					// console.log(res);
 					this.shopList = res.data.list
 					console.log(this.shopList);
 				})