From d5902c4065c586d15ee44dea03ab147412e2dabe Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Wed, 6 Sep 2023 13:56:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E7=95=8C=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/shoppinglist/shoppinglist.vue      | 84 ++++++++++++++----
 pages.json                                    |  4 +-
 pages/admin/order/index.vue                   |  1 -
 .../commissionedSales/addDelegation/index.vue |  8 +-
 .../delegation_details/index.vue              | 67 ++++++++++++--
 .../initiateDelegation/index.vue              | 88 ++++++++++++++++---
 pages/gather/gather.vue                       |  3 +-
 pages/moreProject/moreProject.vue             |  4 +-
 8 files changed, 215 insertions(+), 44 deletions(-)

diff --git a/components/shoppinglist/shoppinglist.vue b/components/shoppinglist/shoppinglist.vue
index 3b921a9..29d6598 100644
--- a/components/shoppinglist/shoppinglist.vue
+++ b/components/shoppinglist/shoppinglist.vue
@@ -62,12 +62,13 @@
 									<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"
-										:isMax="true" :isMin="true" index="11" @eventChange="numberChange($event,i)"  >
+										: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"
-										:isMin="true" index="11" @eventChange="numberChange($event,i)"  ></subtractive>
+										:isMin="true" index="11" @increment="incrementTotal($event,i,item)"
+										@eventChange="numberChange($event,i)"></subtractive>
 								</view>
 							</view>
 						</view>
@@ -130,7 +131,7 @@
 				bought: [],
 
 				checkedArr: [],
-
+				aryys: [],
 				// picker下拉数据源
 				storageCustomList: [{
 					CustGoodsCode: "TEST001",
@@ -165,14 +166,35 @@
 		},
 		mounted() {
 			this.checkedArr = this.checkedObj
+			this.aryys = this.checkedObj
 			this.getBounht();
 		},
 		methods: {
 			//价格
-			producrprice(e, i,item) {
-				
+			producrprice(e, i, item) {
 				this.bought[i].price = e.detail.value
-                this.$set(item, 'check',false);
+				this.$set(item, 'check', false);
+				for (let i in this.checkedArr) {
+					if (this.checkedArr[i].product_id == item.product_id) {
+						this.checkedArr.splice(i, 1)
+					}
+				}
+
+
+
+			},
+			incrementTotal(e, i, item) {
+				this.$set(item, 'check', false);
+				for (let i in this.checkedArr) {
+					if (this.checkedArr[i].product_id == item.product_id) {
+						this.checkedArr.splice(i, 1)
+					}
+				}
+
+
+
+
+
 			},
 			// picker修改事件
 			bindPickerChange: function(e, storage, num) {
@@ -220,15 +242,22 @@
 
 			setValue: function(event) {
 				this.$set(this.whereb, 'keyword', event.detail.value);
+				if (!event.detail.value) {
+					this.whereb.page = 1
+					this.loadedb = false
+					this.getBounht()
+				}
 
 			},
 			searchBut() {
-				this.whereb.page = this.wherec.page = this.wheres.page =
-					this.bought = []
-				this.isActive == 0 ? this.getBounht() : ''
+				this.bought = []
+				this.whereb.page = 1
+				this.loadedb = false
+				this.getBounht()
 			},
 			getBounht() {
 				var that = this;
+				// console.log('1111111', that.loadingb, that.loadedb)
 				if (that.loadingb || that.loadedb) return;
 				that.loadingb = true;
 
@@ -268,7 +297,9 @@
 			getCheckedGoods() {
 				this.checked = []
 				this.checkedArr.forEach((item, index) => {
-					this.check.push(item)
+					this.checkedArr.push(item)
+
+
 				})
 			},
 			/*点击选中与否*/
@@ -278,22 +309,41 @@
 					if (this.peicenumber == 0) {
 						item.number = 1
 					}
-
 					if (!item.product_attr_unique) {
 						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.spu_id == item.spu_id) || (item
-						.spu_id == (
-							itemn.spu && itemn.spu.spu_id)))), 1)
+					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() {
-			
+
 				this.$emit('getProduct', this.checkedArr);
 
 			},
@@ -302,6 +352,8 @@
 </script>
 
 <style lang="scss" scoped>
+
+	
 	.containers {
 		background: #ffffff;
 		border-radius: 16rpx 16rpx 0 0;
diff --git a/pages.json b/pages.json
index a07b258..bbc216a 100644
--- a/pages.json
+++ b/pages.json
@@ -1545,11 +1545,13 @@
 				"selectedIconPath": "static/tabbar_icon/e-a.png",
 				"text": "我的"
 			}
-		],
+		]
+		,
 		"midButton": {
 			"width": "68px",
 			"height": "70px",
 			"iconWidth": "48px",
+			"selectedColor": "#E93323",
 			"pagePath": "pages/plant_release/index",
 			"iconPath": "static/tabbar_icon/d.png",
 			"text": "发布"
diff --git a/pages/admin/order/index.vue b/pages/admin/order/index.vue
index 460b5cf..9387d8a 100644
--- a/pages/admin/order/index.vue
+++ b/pages/admin/order/index.vue
@@ -239,7 +239,6 @@
 				const data = {
 					product_type: this.where.product_type
 				}
-				console.log('data', data);
 				orderStatistics(mer_id, data).then(
 					res => {
 						that.census = res.data.order;
diff --git a/pages/commissionedSales/addDelegation/index.vue b/pages/commissionedSales/addDelegation/index.vue
index 5b800aa..4aeef1e 100644
--- a/pages/commissionedSales/addDelegation/index.vue
+++ b/pages/commissionedSales/addDelegation/index.vue
@@ -38,7 +38,7 @@
 							</view>
 						</view>
 					</view>
-					<view class="content_center-one" v-for="(item,i) in productList" :key="i">
+					<view class="content_center-one"   v-for="(item,i) in productList" :key="i">
 						<view class="center-one">
 							<view class="center-one-img">
 								<image :src="item.image" mode=""></image>
@@ -132,7 +132,7 @@
 
 			// 日历确定
 			confirm(e) {
-
+				
 				let self = this
 				if (e.range.after && e.range.before) {
 					let star = new Date(e.range.after).getTime()
@@ -140,8 +140,8 @@
 					let arr = stop - star
 					this.date = Math.floor(arr / (24 * 3600 * 1000));
 					// console.log(days)
-					if (this.date < 0) {
-						this.date = this.date * -1
+					if(this.date<0){
+						this.date=this.date*-1
 					}
 				}
 			},
diff --git a/pages/commissionedSales/delegation_details/index.vue b/pages/commissionedSales/delegation_details/index.vue
index df12537..bf4a44a 100644
--- a/pages/commissionedSales/delegation_details/index.vue
+++ b/pages/commissionedSales/delegation_details/index.vue
@@ -1,6 +1,17 @@
 <template>
 	<view class="content">
 		<view class="content_top">
+			<view class="content_top-one">
+				<image src="@/static/images/dong.gif" mode="aspectFill"></image>
+			</view>
+			<view class="content_top-two">
+				<view class="top-two-one">
+					待评价
+				</view>
+				<view class="top-two-two">
+					2020-07-07 14:14:14
+				</view>
+			</view>
 		</view>
 		<view class="content_center">
 			<view class="content_center-one">
@@ -78,6 +89,14 @@
 						通滩镇镇街店铺
 					</view>
 				</view>
+				<view class="center-two">
+					<view class="center-twoa">
+						结算利息:
+					</view>
+					<view class="center-twob">
+						通滩镇镇街店铺
+					</view>
+				</view>
 				<view class="center-two">
 					<view class="center-twoa">
 						状态:
@@ -99,7 +118,7 @@
 						拒绝原因:
 					</view>
 					<view class="center-twob">
-						通滩镇镇街店铺
+						通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺通滩镇镇街店铺
 					</view>
 				</view>
 			</view>
@@ -133,16 +152,50 @@
 </template>
 
 <script>
+		import {} from '@/api/sale.js'
 </script>
 
 <style lang="scss">
-	.content{
+	.content {
 		position: relative;
 	}
+
 	.content_top {
 		height: 151rpx;
 		background: linear-gradient(84deg, #2352FA 0%, #6497FF 100%);
-		
+		display: flex;
+		padding-top: 21rpx;
+
+		.content_top-one {
+			width: 107rpx;
+			height: 107rpx;
+			margin-left: 28rpx;
+
+			image {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.content_top-two {
+			margin-left: 25rpx;
+
+			.top-two-one {
+				font-size: 35rpx;
+				font-family: PingFang SC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+				margin-top: 10rpx;
+			}
+
+			.top-two-two {
+				font-size: 28rpx;
+				font-family: SF Pro Display-Light, SF Pro Display;
+				font-weight: 300;
+				color: #FFFFFF;
+				margin-top: 10rpx;
+			}
+		}
 
 	}
 
@@ -217,6 +270,10 @@
 				}
 
 				.center-twob {
+					width: 360rpx;
+					text-align: right;
+					border: 1px solid;
+					word-wrap: break-word;
 					font-size: 32rpx;
 					font-family: PingFang SC;
 					font-weight: 400;
@@ -273,10 +330,8 @@
 		color: #FFFFFF;
 		position: absolute;
 		left: 50%;
-		margin-left:-347rpx;
+		margin-left: -347rpx;
 		position: fixed;
 		bottom: 100rpx;
 	}
-
-
 </style>
\ No newline at end of file
diff --git a/pages/commissionedSales/initiateDelegation/index.vue b/pages/commissionedSales/initiateDelegation/index.vue
index ce2d100..1f8eaf2 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 list" :key="i">
 
 			<view class="content-one">
 				<view class="content-one-img">
@@ -35,7 +35,7 @@
 						处理
 					</view>
 					<span></span>
-					<view class="contentgn_b">
+					<view class="contentgn_b" @click="detail">
 						详情
 					</view>
 				</view>
@@ -90,7 +90,15 @@
 				</view>
 			</view>
 		</view>
+		<view class="adddelegation"  @click="addDelegation">
 
+			<view class="adddelegation-one">
+				<image src="@/static/images/delegation.png" mode=""></image>
+			</view>
+			<view class="adddelegation-two">
+				新增委托
+			</view>
+		</view>
 		<view v-if="orderList.length == 0 && this.where.page > 1">
 			<emptyPage title="暂无订单~"></emptyPage>
 		</view>
@@ -235,6 +243,7 @@
 <script>
 	import cxNavTitle from '@/components/cx-navTitle.vue'
 	import emptyPage from '@/components/emptyPage.vue';
+		import {} from '@/api/sale.js'
 	export default {
 		components: {
 			cxNavTitle,
@@ -296,7 +305,7 @@
 		onLoad() {
 			this.tabTitle = this.tabs[0].name
 			//有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下:
-			console.log(this.tabs[0])
+			// console.log(this.tabs[0])
 
 		},
 		mounted() {
@@ -308,26 +317,36 @@
 				// 	url: '/pages/commissionedSales/delegation_details/index'
 				// })
 			},
+			
+			//选择
 			tabClick(e) { //点击获取当前标签数据 
 				this.activeItem = e.name; //当前class类名 
 				this.tabTitle = e.name; //当前选的标签名
 			},
+			//新增委托
+			addDelegation(){
+				uni.navigateTo({
+					url:'/pages/commissionedSales/addDelegation/index'
+				})
+			},
 			//管理弹窗
 			close() {
-				console.log('1111111')
 				this.$refs.bindmobile.close()
 				this.$refs.bindmobile1.close()
 				this.$refs.bindmobile2.close()
 				this.$refs.bindmobile3.close()
 			},
+			//详情
+
+			detail() {
+				uni.navigateTo({
+					url: '/pages/commissionedSales/delegation_details/index'
+				})
+			},
 			// 待处理
 			soldEdit() {
 
 				this.$refs.bindmobile.open()
-
-
-
-
 			},
 			//已接受
 			accepted() {
@@ -359,10 +378,56 @@
 </script>
 
 <style lang="scss" scoped>
+	.content {
+		height: 100vh;
+		position: relative;
+		
+	}
+
 	.content_top {
 		background-color: #FFFFFF;
 	}
 
+	.adddelegation {
+		width: 694rpx;
+		height: 95rpx;
+
+
+		background: linear-gradient(276deg, #F98649 0%, #F34E45 100%);
+		box-shadow: 0 5rpx 11rpx 2rpx rgba(136, 20, 7, 0.3);
+		border-radius: 47rpx 47rpx 47rpx 47rpx;
+		opacity: 1;
+		display: flex;
+		position: fixed;
+		position: absolute;
+		bottom: 84rpx;
+		left: 50%;
+		margin-left: -347rpx;
+
+		.adddelegation-one {
+			width: 50rpx;
+			margin-right: 30rpx;
+			height: 50rpx;
+			margin-left: 242rpx;
+
+			margin-top: 21rpx;
+
+			image {
+				width: 50rpx;
+				height: 50rpx;
+			}
+		}
+
+		.adddelegation-two {
+			font-size: 32rpx;
+			font-family: PingFang SC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+			margin-top: 25rpx;
+		}
+
+
+	}
 
 	.content_top {
 
@@ -558,12 +623,11 @@
 				}
 
 				span {
-					width: 0px;
+					width: 1px;
 					height: 30rpx;
 					opacity: 1;
-
-					margin-top: 10rpx;
-					border: 2rpx solid #CCCCCC;
+					margin-top: 8rpx;
+					background-color: #cccccc;
 
 				}
 
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index da9e836..8baff7b 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -306,7 +306,7 @@
 			},
 			// 编辑完成
 			editComfirm() {
-this.editFlag = false;
+				this.editFlag = false;
 				uni.setStorageSync('gatherNowMenuList', JSON.stringify(this.nowMenuList));
 			},
 			getUniMp(appid) {
@@ -360,7 +360,6 @@ this.editFlag = false;
 
 				this.$nextTick(() => {
 					this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
-
 				})
 				this.showPicker = false
 			},
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index ef93489..cd2f1b5 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -124,7 +124,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,7 +140,7 @@
 								<image class="icon_img" src="@/static/images/fabu.png" mode="aspectFill">
 								</image>
 								<text class="text">发布管理</text>
-							</view> -->
+							</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">
 							</image>