更改委托功能及tabar图片

api/sale.js

@@ -35,8 +35,22 @@ export function checkchain(id,data) {
 export function finishchain(id,data) {
   return request.post("community/entrust/apply/finish/"+id, data);
 }
-
+//商家申请结束委托
+export function finishentrust(id,data) {
+  return request.post("community/entrust/finish/"+id, data);
+}
 //委托商品加入购物车
 export function addEntrustCart(data) {
   return request.post("community/entrust/addEntrustCart", data);
 }
+
+
+//获取委托商品详情
+export function entrustdetail(id) {
+  return request.get("community/entrust/"+id);
+}
+
+//编辑委托商品详情
+export function editentrust(id,data) {
+  return request.post("community/entrust/edit/"+id, data);
+}

pages.json

@@ -1611,16 +1611,16 @@
 			},
 			{
 				"pagePath": "pages/plant_release/index",
-				"iconPath": "static/tabbar_icon/d.png",
+				"iconPath": "static/tabbar_icon/c.png",
-				"selectedIconPath": "static/tabbar_icon/d-a.png",
+				"selectedIconPath": "static/tabbar_icon/c-a.png",
-				"text": "发布",
+				"text": "发布"
-				"visible": false
+			
 			},
 			{
 				"pagePath": "pages/supply_chains/supply_chains",
 
-				"iconPath": "static/tabbar_icon/c.png",
+				"iconPath": "static/tabbar_icon/d.png",
-				"selectedIconPath": "static/tabbar_icon/c-a.png",
+				"selectedIconPath": "static/tabbar_icon/d-a.png",
 				"text": "供应"
 			},
 			{
@@ -1629,16 +1629,8 @@
 				"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": "发布"
-		}
 
 
 

pages/commissionedSales/delegation_details/index.vue

@@ -10,7 +10,9 @@
 					{{objinfo.mer_status==0?"待处理":""||objinfo.mer_status==2?"已拒绝":""||objinfo.mer_status==1?"已接受":""}}
 				</view>
 				<view class="top-two-two">
-					2020-07-07 14:14:14
+					<!-- 2020-07-07 14:14:14
+					 -->
+					 {{objinfo.entrust_start_date}}
 				</view>
 			</view>
 		</view>
@@ -37,12 +39,12 @@
 
 			</view>
 
-			<view class="content_center-two">
+			<view class="content_center-two" v-if="objinfo">
 				<view class="center-two">
 					<view class="center-twoa">
 						委托方:
 					</view>
-					<view class="center-twob">
+					<view class="center-twob" >
 						{{objinfo.mer_info.mer_name}}
 					</view>
 				</view>
@@ -50,7 +52,7 @@
 					<view class="center-twoa">
 						被委托方:
 					</view>
-					<view class="center-twob">
+					<view class="center-twob" >
 						{{objinfo.entrust_mer_info.mer_name}}
 					</view>
 				</view>
@@ -150,12 +152,12 @@
 						img: require('@/static/images/wtt2.png')
 					}
 				],
-type:0,
+				type: 0,
 			}
 		},
 		onLoad(e) {
 			this.list(e.id)
-			this.type=e.type
+			this.type = e.type
 		},
 		onShow() {
 
@@ -164,15 +166,17 @@ type:0,
 
 			list(id) {
 				entrustdetail(id).then((res) => {
-
+console.log(res.data)
 					this.objinfo = res.data
 				})
 			},
 
-			submit(item){
+			submit(item) {
-			addEntrustCart({community_id:item.community_id}).then(res=>{
+				addEntrustCart({
+					community_id: item.community_id
+				}).then(res => {
 
-				if(res.status==200){
+					if (res.status == 200) {
 						this.$util.Tips({
 							title: res.message,
 							icon: 'success'
@@ -192,9 +196,10 @@ type:0,
 
 
 <style lang="scss">
-	.content{
+	.content {
 		position: relative;
 	}
+
 	.content_top {
 		height: 151rpx;
 		background: linear-gradient(84deg, #2352FA 0%, #6497FF 100%);
@@ -366,10 +371,8 @@ type:0,
 		color: #FFFFFF;
 		position: absolute;
 		left: 50%;
-		margin-left:-347rpx;
+		margin-left: -347rpx;
 		position: fixed;
 		bottom: 100rpx;
 	}
-
-
 </style>

pages/commissionedSales/initiateDelegation/index.vue

@@ -17,7 +17,7 @@
 						{{item.title}}
 					</view>
 					<view class="one-txt-b">
-						委托周期:{{item.credit_buy}}
+						委托周期:{{item.entrust_day}}
 					</view>
 				</view>
 			</view>
@@ -51,10 +51,10 @@
 					已接受
 				</view>
 				<view class="contentgn">
-					<view class="contentgn_a" @click="closingorder">
+					<view class="contentgn_a"   @click="closingorder(item)" v-if="item.entrust_finish==3">
 						结束委托
 					</view>
-					<span></span>
+					<span v-if="item.entrust_finish==3"></span >
 					<view class="contentgn_b" @click="detail(item)">
 						详情
 					</view>
@@ -166,17 +166,17 @@
 							<view class="bg-content-a" style="margin-left: 207rpx;">
 								结束委托申请处理
 							</view>
-							<view class="bg-content-b">
+							<view class="bg-content-b" v-if="obj.mer_info">
-								结算周期: <span>30天</span>
+								结算周期: <span>{{obj.mer_info.settle_cycle}}天</span>
 							</view>
-							<view class="bg-content-c">
+							<view class="bg-content-c" v-if="obj.mer_info">
-								利息比例: <span>0.05%</span>
+								利息比例: <span>{{obj.mer_info.interest_rate}}%</span>
 							</view>
 							<view class="entrust_bga_btn">
-								<view class="cancellation">
+								<view class="cancellation"  @click="refused">
 									拒绝
 								</view>
-								<view class="determine">
+								<view class="determine"  @click="agree(obj)">
 									接受
 								</view>
 							</view>
@@ -197,19 +197,19 @@
 							<view class="bg-content-a" style="margin-left: 207rpx;">
 								结束委托申请处理
 							</view>
-							<view class="bg-content-b">
+							<view class="bg-content-b" v-if="obj.mer_info">
-								结算周期: <span>30天</span>
+								结算周期: <span>{{obj.mer_info.settle_cycle}}天</span>
 							</view>
-							<view class="bg-content-c">
+							<view class="bg-content-c" v-if="obj.mer_info">
-								利息比例: <span>0.05%</span>
+								利息比例: <span>{{obj.mer_info.interest_rate}}%</span>
 							</view>
 							<view class="bg-content-c">
 								拒绝原因：
 								<view class="" style="margin-top: 21rpx;">
-									<textarea value="" placeholder="输入拒绝原因" class="bg-content_textarea" />
+									<textarea v-model="refuseds" placeholder="输入拒绝原因" class="bg-content_textarea" />
 								</view>
 							</view>
-							<view class="entrust_bga_btn">
+							<view class="entrust_bga_btn" @click="agree(obj)">
 								<view class="determine">
 									接受
 								</view>
@@ -228,7 +228,8 @@
 	import {
 		entrustlist,
 		finishchain,
-		checkchain
+		checkchain,
+		finishentrust
 	} from '@/api/sale.js'
 	export default {
 		components: {
@@ -290,7 +291,8 @@
 
 					}
 				],
-				obj: {}
+				obj: {},
+				refuseds:''
 			}
 		},
 		onLoad() {
@@ -330,7 +332,7 @@
 				this.activeItem = e.name; //当前class类名 
 				this.tabTitle = e.name; //当前选的标签名
 				this.where.page = 1
-				this.orderList=[]
+				this.orderList = []
 				this.where.status = e.type
 				this.commislist()
 			},
@@ -355,14 +357,14 @@
 			},
 			//提交订单
 
-			order(item){
+			order(item) {
-				 if(item.mer_status==0&&entrust_order_id!=0){
+				if (item.mer_status == 0 && entrust_order_id != 0) {
 					uni.navigateTo({
 						url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id
 					})
-				 }else{
+				} else {
 					this.$util.Tips({
-					 	title:'商家还没同意该订单',
+						title: '商家还没同意该订单',
 						icon: 'err'
 					})
 				}
@@ -386,15 +388,41 @@
 
 			},
 			//结束委托
-			closingorder() {
+			closingorder(item) {
-				this.$refs.bindmobile1.open()
+				console.log(item)
+				this.obj=item
+				this.$refs.bindmobile2.open()
 				// this.$refs.bindmobile3.open()
 			},
+			//拒绝申请委托
+			refused() {
+				this.$refs.bindmobile2.close()
+				setTimeout(() => {
+					this.$refs.bindmobile3.open()
+				}, 1000)
+			},
 			// 已拒绝
 			declined() {
 				// this.$refs.bindmobile2.open()
 				this.$refs.bindmobile3.open()
 			},
+			agree(item){
+				finishentrust(item.community_id,{
+					 status: 2,
+					 refusal:this.refuseds
+				}).then(res => {
+					
+					this.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					})
+					this.orderList = []
+					this.tabTitle = "tabTwo"
+					this.$refs.bindmobile2.close()
+					this.$refs.bindmobile3.close()
+					this.commislist()
+				})
+			},
 			//删除订单
 			deleteOrder(item) {
 				checkchain(item.community_id, {

pages/commissionedSales/receivedCommission/index.vue

@@ -51,7 +51,7 @@
 				<view class="contentgn">
 					<view class="contentgn_a" style="margin-left: 10rpx;"
 						v-if="item.entrust_order_id>0&&item.mer_status==1" @click="closingorder(item)">
-						结束委托
+						申请结束委托
 					</view>
 					<span v-if="item.entrust_order_id>0&&item.mer_status==1"></span>
 					<view class="contentgn_a" v-if="item.entrust_order_id==0" style="margin-left: 10rpx;"
@@ -60,9 +60,6 @@
 					</view>
 					<span v-if="item.entrust_order_id==0"></span>
 
-
-
-
 					<view class="contentgn_b" @click="detail(item)">
 						详情
 					</view>
@@ -370,9 +367,9 @@
 					url: '/pages/commissionedSales/delegation_details/index?id=' + item.community_id + '&type=1'
 				})
 			},
-			//结束委托申请
+			//申请结束委托申请
 			deteragrss(item) {
-				console.log(item)
+
 				finishchain(item.community_id, {
 					status: 1
 				}).then((res) => {
@@ -384,9 +381,9 @@
 					this.orderList = []
 					this.tabTitle = "tabTwo"
 					this.commislist()
-					this.$refs.bindmobile1.colse()
+					this.$refs.bindmobile1.close()
-				}).catch((err)=>{
+				}).catch((err) => {
-		
+                    this.$refs.bindmobile1.close()
 					this.$util.Tips({
 						title: err,
 						icon: 'error'
@@ -428,7 +425,7 @@
 					this.orderList = []
 					this.tabTitle = "tabOne"
 					this.commislist()
-					this.$refs.bindmobile1.colse()
+					this.$refs.bindmobile.close()
 				})
 			},
 			//审核通过 同意

pages/order_pay_status/index.vue

@@ -232,6 +232,17 @@
 							})
 						}
 					
+				} else if (this.product_type == 99) {
+					if(val==1){
+						uni.navigateTo({
+							url: `/pages/users/order_list/relase?status=1&product_type=${this.product_type}`
+						})
+						}else{
+							uni.navigateTo({
+								url: `/pages/users/order_list/relase?status=0&product_type=${this.product_type}`
+							})
+						}
+					
 				} else {
 					if(val==1){
 						uni.navigateTo({

pages/supply_chains/supply_chains.vue

@@ -14,7 +14,11 @@
 						<view :class="['iconfont','icon-xiaoxi',isFshow?'sitebox':'']" style="color:#000;"></view>
 					</navigator>
 				</view>
+
+
 			</view>
+
+
 			<zbpSwiper :isSelectPlace="true" :town="street" :streetname="street" :location_Arr="locationArr"
 				@change="dchange">
 			</zbpSwiper>
@@ -70,8 +74,6 @@
 			</view>
 
 			<view class="list-con">
-				<!-- <view class="list-con-left"
-					@tap="navgo('/pages/nongKe/specialty/index?type_code=TypeFamousSpecialties')"> -->
 				<view class="list-con-left"
 					@tap="navgo('/pages/nongKe/specialty/index?type_code=TypeFamousSpecialties')">
 					<!-- <view class="list-con-title">
@@ -85,8 +87,6 @@
 					<image src="@/static/images/f5.png" mode="aspectFit"></image>
 				</view>
 				<view class="list-con-right">
-					<!-- <view class="con-right" style="margin-bottom: 20rpx"
-						@click="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')"> -->
 					<view class="con-right" style="margin-bottom: 20rpx"
 						@click="navgo('/pages/nongKe/food/index?type_code=TypeLocalCuisine')">
 						<!-- <view class="list-con-title">
@@ -99,8 +99,6 @@
 						</view> -->
 						<image src="@/static/images/f7.png" mode="aspectFit"></image>
 					</view>
-					<!-- 	<view class="con-right"
-						@click="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')"> -->
 					<view class="con-right"
 						@click="navgo('/pages/nongKe/tourism/index?type_code=TypeFeaturedCultural')">
 						<!-- <view class="list-con-title">
@@ -119,7 +117,10 @@
 				<image src="@/static/images/f4.png" mode="aspectFit"></image>
 			</view>
 			<view class="goodslist">
-				<WaterfallsFlow :wfList="cateGoods" />
+				<WaterfallsFlow :wfList="productList"  :type="1" />
+			</view>
+			<view class='loadingicon acea-row row-center-wrapper' v-if='productList.length > 0'>
+				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
 			</view>
 			<view class="empty_wrapper" v-if="emptyShow">
 				<u-empty :show="emptyShow" mode="list" icon="http://cdn.uviewui.com/uview/empty/list.png"></u-empty>
@@ -128,13 +129,12 @@
 
 		<u-picker :defaultIndex="[0, 0]" :show="showPicker" ref="uPicker" :columns="columnData" @confirm="confirm"
 			@cancel="showPicker = false" @change="changeHandler" keyName="name"></u-picker>
-		<u-loadmore :status="status" v-if="cateGoods.length >= where.limit" />
+
 
 		<view class="location" v-if="isshow">
 			<view class="locationa"> 位置权限使用说明 </view>
 			<view class="locationb"> 用于向你推荐最近门店 </view>
 		</view>
-		<!-- <m-tabbar native>
 		<!-- <m-tabbar native>
 		      <template v-slot:tabbar_index_2>
 		        <view class="custom_style">
@@ -199,7 +199,7 @@
 				},
 				isshow: false,
 				locationArr: ({}),
-				status: 'loadmore',
+			
 				bgColor: '',
 				showPicker: false,
 				columnData: [],
@@ -223,20 +223,23 @@
 				location: '',
 				emptyShow: false,
 				town: '',
-				cateGoods: [],
+				productList: [],
 				recoList: [],
 				articleList: [],
 				street_id: '',
 				street: '',
 				bgColor: '',
 				isFshow: false,
-				backColor: 'rgba(252, 252, 252, 0)'
+				backColor: 'rgba(252, 252, 252, 0)',
+				loadend: false,
+				loading: false,
+				loadTitle: '加载更多',
 			}
 		},
 
 		onPullDownRefresh() {
-			this.cateGoods = []
+			
-			this.list()
+			this.list(true);
 			this.Area()
 			uni.stopPullDownRefresh()
 		},
@@ -263,11 +266,15 @@
 		},
 
 		onReachBottom() {
-			if (this.status == 'nomore') return;
+			if (this.productList.length > 0) {
-			this.status = 'loading';
+				setTimeout(() => {
-			this.where.page = ++this.where.page;
+					this.list(false);
-
+				}, 500)
+			} else {
 				this.list()
+			}
+
+			
 		},
 		beforeDestroy() {
 			// 销毁监听事件
@@ -322,17 +329,59 @@
 
 			},
 			//获取商品列表
-			list(id) {
+			list(isPage,id) {
 				if (id) {
-					spuInfo(id, this.where1).then(res => {
-						this.cateGoods.push(...res.data.list)
 					
-					})
+					let that = this;
+					if (that.loadend) return;
+					if (that.loading) return;
+						           
+					if (isPage === true) that.$set(that, 'productList', []);
+							
+					that.loading = true;
+					that.loadTitle = '';
+					spuInfo(id,that.where).then(res => {
+						let list = res.data.list;
+						let productList = that.$util.SplitArray(list, that.productList);
+						let loadend = list.length < that.where.limit;
+						that.loadend = loadend;
+						that.loading = false;
+						that.loadTitle = loadend ? '已全部加载' : '加载更多';
+						that.$set(that, 'productList', productList);
+						// console.log(that.productList)
+						that.$set(that.where, 'page', that.where.page + 1);
+						if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
+					}).catch(err => {
+						that.loading = false;
+						that.loadTitle = '加载更多';
+					});
+					
 					 
 				} else {
-					getProductHot(this.where.page, this.where.limit).then(res => {
+					let that = this;
-						this.cateGoods.push(...res.data.list)
+					if (that.loadend) return;
-					})
+					if (that.loading) return;
+						           
+					if (isPage === true) that.$set(that, 'productList', []);
+							
+					that.loading = true;
+					that.loadTitle = '';
+					getProductHot(that.where.page,that.where.limit).then(res => {
+						let list = res.data.list;
+						let productList = that.$util.SplitArray(list, that.productList);
+						let loadend = list.length < that.where.limit;
+						that.loadend = loadend;
+						that.loading = false;
+						that.loadTitle = loadend ? '已全部加载' : '加载更多';
+						that.$set(that, 'productList', productList);
+						// console.log(that.productList)
+						that.$set(that.where, 'page', that.where.page + 1);
+						if (that.where.page == 1 && res.data.list.length <= 0) that.emptyShow = true
+					}).catch(err => {
+						that.loading = false;
+						that.loadTitle = '加载更多';
+					});
+					
 				}
 
 
@@ -398,8 +447,8 @@
 				this.street = e.value[1].name
 				this.street_id = e.value[1].code
 				this.town = e.value[1].name
-				this.cateGoods=[]
+				this.productList=[]
-                this.list(this.street_id)
+                this.list(true,this.street_id)
 				this.$nextTick(() => {
 					this.$bus.$emit('value-updated', e.value[1].name + ',' + e.value[1].code);
 
@@ -489,7 +538,7 @@
 				this.street = e.value[1].name
 				this.street_id = e.value[1].code
 				this.town = e.value[1].name
-				this.cateGoods=[]
+				this.productList=[]
 				this.list(this.street_id)
 			},
 			selfLocation() {
@@ -512,6 +561,7 @@
 							lat: latitude,
 							long: longitude
 						}).then(res => {
+							this.isshow = false
 							this.town = res.data.address_reference.town.title
 							this.street_id = res.data.address_reference.town.id
 							this.street = res.data.address_component.street
@@ -522,6 +572,7 @@
 							})
 							this.list(this.street_id)
 						}).catch(err => {
+							this.isshow = false
 							uni.showToast({
 								title: err,
 								icon: 'none'