引导界面 收到委托列表

components/WaterfallsFlowItem/WaterfallsFlowItem.vue

@@ -80,7 +80,7 @@ export default {
 				require: true
 			},
 		type: {
-			type: Number,
+			type: Number|String,
 			default: 0
 		},
 		isStore: {

config/app.js

@@ -9,8 +9,8 @@ let httpApiThree
 // 网络接口修改此字符 小程序域名要求https
 // let httpApi = 'http://192.168.31.110:8324' // 测试
 if (process.env.NODE_ENV === "development") {
-	httpApi = 'https://shop.lihaink.cn' // 生产
+	// httpApi = 'https://shop.lihaink.cn' // 生产
-	// httpApi = "https://crmeb-test.shop.lihaink.cn"
+	httpApi = "https://crmeb-test.shop.lihaink.cn"
 	// httpApi = "http://192.168.0.222"
 	// httpApi = "http://192.168.0.108:8325"
 	// httpApi = 'http://192.168.0.108:8325'
@@ -25,7 +25,7 @@ if (process.env.NODE_ENV === "development") {
 	// #endif
 } else if (process.env.NODE_ENV === 'production') {
 	httpApi = 'https://shop.lihaink.cn' // 生产
-	// httpApi = "https://crmeb-test.shop.lihaink.cn"
+	//httpApi = "https://crmeb-test.shop.lihaink.cn"
 	httpApiTwo = 'https://nk.lihaink.cn' // 生产
 	httpApiThree = 'http://ceshi-oa.lihaink.cn' //生产
 }

manifest.json

@@ -2,8 +2,8 @@
     "name" : "惠农生活",
     "appid" : "__UNI__3A527D1",
     "description" : "",
-    "versionName" : "1.3.0",
+    "versionName" : "1.3.1",
-    "versionCode" : 130,
+    "versionCode" : 131,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/commissionedSales/initiateDelegation/index.vue

@@ -33,6 +33,10 @@
 						处理
 					</view>
 					<span></span>
+					<view class="contentgn_a" style="margin-left: 10rpx;" @click="deleteOrder(item)">
+						删除
+					</view>
+					<span></span>
 					<view class="contentgn_b" @click="detaildetail(item)">
 						详情
 					</view>
@@ -309,7 +313,11 @@
 			//获取分类数据
 			commislist() {
 				entrustlist(this.where).then((res) => {
-					this.orderList = res.data.list
+					this.orderList.push(...res.data.list)
+					if (res.data.list.length < this.where.limit) this.status = 'nomore'
+
+					if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
+
 				})
 			},
 
@@ -363,14 +371,22 @@
 			},
 			//删除订单
 			deleteOrder(item) {
-
+				checkchain(item.entrust_mer_id).then(res => {
+					this.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					})
+					this.orderList = []
+					this.tabTitle = "tabOne"
+					this.commislist()
+				})
 			},
 			// 审核未通过 编辑
 			auditEdit() {
 
 			},
 			//审核通过 拒绝
-			passDelete() {
+			passDelete(item) {
 				checkchain(item.entrust_mer_id, {
 					status: 2
 				}).then((res) => {
@@ -379,7 +395,7 @@
 						icon: 'success'
 					})
 					this.orderList = []
-					this.tabTitle ="tabOne"
+					this.tabTitle = "tabOne"
 					this.commislist()
 				})
 			},
@@ -393,7 +409,7 @@
 						icon: 'success'
 					})
 					this.orderList = []
-					this.tabTitle ="tabOne"
+					this.tabTitle = "tabOne"
 					this.commislist()
 					this.$refs.bindmobile.close()
 				})

pages/commissionedSales/receivedCommission/index.vue

@@ -5,8 +5,8 @@
 			<!--选项卡滑动切换-->
 			<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-content" v-for="(item,i) in orderList" :key="i">
 
 			<view class="content-one">
 				<view class="content-one-img">
@@ -14,81 +14,90 @@
 				</view>
 				<view class="content-one-txt">
 					<view class="one-txt-a">
-						{{item.content}}
+						{{item.title}}
 					</view>
 					<view class="one-txt-b">
-						委托周期:{{item.day}}
+						委托周期:{{item.credit_buy}}
 					</view>
 				</view>
 			</view>
 
-			<view class="content-two_one" v-if="item.type==1">
+
-				<view class="content-two-edita" @click="soldEdit">
+
+			<view class="content-two_one" v-if="item.mer_status==0">
+				<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">
+					<view class="contentgn_a" style="margin-left: 10rpx;" @click="deleteOrder(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_oneq" v-if="item.mer_status==1">
 				<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 class="contentgn_b" @click="detail">
 						详情
 					</view>
 				</view>
 			</view>
-			<view class="content-two_one" v-if="item.type==3">
+			<view class="content-two_one" v-if="item.mer_status==2">
 				<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-one">
+				<image src="@/static/images/delegation.png" mode=""></image>
+			</view>
+			<view class="adddelegation-two">
+				新增委托
+			</view>
+		</view>
 		<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;">
 				<view class="entrust">
 					<view class="entrust_close" @click="close">
@@ -100,19 +109,16 @@
 								委托申请处理
 							</view>
 							<view class="bg-content-b">
-								结算周期: <span>30天</span>
+								结算周期: <span>{{obj.settle_cycle}}天</span>
-
-
 							</view>
 							<view class="bg-content-c">
-								利息比例: <span>0.05%</span>
+								利息比例: <span>{{obj.interest_rate}}%</span>
 							</view>
-
 							<view class="entrust_bga_btn">
-								<view class="cancellation">
+								<view class="cancellation" @click="passDelete(obj)">
 									拒绝
 								</view>
-								<view class="determine">
+								<view class="determine" @click="passagree(obj)">
 									接受
 								</view>
 							</view>
@@ -122,7 +128,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">
@@ -142,15 +147,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">
@@ -163,13 +164,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">
 									拒绝
@@ -197,20 +195,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">
@@ -228,37 +221,43 @@
 <script>
 	import cxNavTitle from '@/components/cx-navTitle.vue'
 	import emptyPage from '@/components/emptyPage.vue';
-	import {} from '@/api/sale.js'
+	import {
+		entrustlist,
+		finishchain,
+		checkchain
+	} from '@/api/sale.js'
 	export default {
 		components: {
 			cxNavTitle,
-			emptyPage
+			emptyPage,
+
 		},
 		data() {
 			return {
 				activeItem: "tabOne",
 				status: 'loadmore',
-				activeItem: "tabOne",
 				tabTitle: "",
 				orderList: [],
 				where: {
 					page: 1,
-					limit: 10
+					limit: 10,
+					type: 2,
+					status: 0
 				},
 				tabs: [{
 						name: "tabOne",
 						label: '待处理',
-						type: '1'
+						type: 0
 					},
 					{
 						name: "tabTwo",
 						label: '已接受',
-						type: '2'
+						type: 1
 					},
 					{
 						name: "tabThree",
 						label: '已拒绝',
-						type: '3'
+						type: 2
 					},
 
 				],
@@ -286,17 +285,18 @@
 						type: 4
 
 					}
-				]
+				],
+				obj: {}
 			}
 		},
 		onLoad() {
 			this.tabTitle = this.tabs[0].name
 			//有时进入页面需要获取默认的第一个标签做逻辑判断 -- 如下:
-			console.log(this.tabs[0])
+			// console.log(this.tabs[0])
 
 		},
 		mounted() {
-
+			this.commislist()
 		},
 		methods: {
 			onReachBottom() {
@@ -306,85 +306,172 @@
 				this.commislist()
 			},
 			nav(item) {
-				uni.navigateTo({
+				// uni.navigateTo({
-					url: '/pages/commissionedSales/delegation_details/index'
+				// 	url: '/pages/commissionedSales/delegation_details/index'
-				})
+				// })
 			},
 			//获取分类数据
 			commislist() {
-				console.log('111111')
+				entrustlist(this.where).then((res) => {
+					this.orderList.push(...res.data.list)
+					if (res.data.list.length < this.where.limit) this.status = 'nomore'
+
+					if (this.where.page == 1 && res.data.list.length <= 0) this.emptyShow = true
+
+				})
 			},
 
 			//选择
 			tabClick(e) { //点击获取当前标签数据 
 				this.activeItem = e.name; //当前class类名 
 				this.tabTitle = e.name; //当前选的标签名
-				if (this.tabTitle = "tabOne") {
 				this.where.page = 1
-					this.orderList = []
+				this.where.status = e.type
 				this.commislist()
-				} else if (this.tabTitle = "tabTwo") {
+			},
-					this.where.page = 1
+			//新增委托
-					this.orderList = []
+			addDelegation() {
-					this.commislist()
+				uni.navigateTo({
-				} else {
+					url: '/pages/commissionedSales/addDelegation/index'
-					this.where.page = 1
+				})
-					this.orderList = []
-					this.commislist()
-				}
 			},
 			//管理弹窗
 			close() {
-				
 				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() {
+			soldEdit(item) {
-
+				this.obj = item
+				console.log(item)
 				this.$refs.bindmobile.open()
-
-
-
-
 			},
 			//已接受
 			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) {
+				checkchain(item.entrust_mer_id).then(res => {
+					this.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					})
+					this.orderList = []
+					this.tabTitle = "tabOne"
+					this.commislist()
+				})
 			},
-
 			// 审核未通过 编辑
 			auditEdit() {
 
 			},
 			//审核通过 拒绝
-			passDelete() {
+			passDelete(item) {
-
+				checkchain(item.entrust_mer_id, {
+					status: 2
+				}).then((res) => {
+					this.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					})
+					this.orderList = []
+					this.tabTitle = "tabOne"
+					this.commislist()
+				})
 			},
 			//审核通过 同意
-			passagree() {
+			passagree(item) {
-
+				checkchain(item.entrust_mer_id, {
+					status: 1
+				}).then((res) => {
+					this.$util.Tips({
+						title: res.message,
+						icon: 'success'
+					})
+					this.orderList = []
+					this.tabTitle = "tabOne"
+					this.commislist()
+					this.$refs.bindmobile.close()
+				})
 			}
 		}
 	}
 </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 {
+
 		width: 100%;
 	}
 
@@ -577,12 +664,11 @@
 				}
 
 				span {
-					width: 0px;
+					width: 1px;
 					height: 30rpx;
 					opacity: 1;
-
+					margin-top: 8rpx;
-					margin-top: 10rpx;
+					background-color: #cccccc;
-					border: 2rpx solid #CCCCCC;
 
 				}
 
@@ -601,6 +687,7 @@
 
 	.entrust {
 
+
 		.entrust_close {
 			width: 44rpx;
 			height: 44rpx;
@@ -836,5 +923,7 @@
 			}
 
 		}
+
+
 	}
 </style>

pages/guide/guide.vue

@@ -0,0 +1,323 @@
+<template>
+	<view>
+		<view class="swiper-css zqui-rel" :style="{ height: hpx }">
+			<swiper class="swiper" :style="{ height: hpx }" :indicator-dots="indicatorDots" :autoplay="autoplay" disable-touch='true' :interval="interval"
+			 :duration="duration" @change="guideAction" >
+				<swiper-item class="flex1" v-for="(item, index) in imageList" :key="index" catchtouchmove="stopChange">
+					<image class="image-size" mode="aspectFit" :src="item.src" />
+				</swiper-item>
+			</swiper>
+			
+			<!-- 按钮样式切换 -->
+			<template v-if="cur != 2">
+				<view class=" flex-column dots">
+					<block v-for="(item,index) in imageList" :key="index">
+						<view class="dot" :class="{'active':  index == cur}"></view>
+					</block>
+				</view>
+			</template>
+			
+			<!-- 第三张图使用按钮《立即进入》 -->
+			<template v-if="cur == 1">
+				<button class="flex-column cu-btn footer" @click="launchApp">立即体验</button>
+			</template>
+			<!-- 右上角跳过按钮 -->
+			<view class="btn-box" @click="launchApp"><text class="passbtn">跳过</text></view>
+		</view>
+		
+		
+	</view>
+</template>
+
+<script>
+	const animation = weex.requireModule('animation');
+	export default {
+		data() {
+			return {
+				//修改图片,文字描述
+				imageList: [
+					{
+					
+						src: '/static/images/guide.png'
+					}
+			
+				],
+				indicatorDots: false,
+				autoplay: false,
+				interval: 10000,
+				duration: 500,
+				iStatusBarHeight: '0px',
+				hpx: '100%',
+				cur: 0,
+				dotsStyles: ''
+			};
+		},
+		onLoad() {
+			let that = this;
+			plus.navigator.closeSplashscreen();
+			uni.getSystemInfo({
+				success: function(res) {
+					that.hpx = res.windowHeight + 'px';
+				}
+			});
+		},
+		onReady() {
+			// this.move(0, 1);
+		},
+		methods: {
+			stopTouchMove: function() {
+				return false;
+			},
+			
+			launchApp() {
+				
+				//跳过引导页,储存本地值,下次进入直接跳过
+				uni.setStorage({
+					key: 'launchFlag',
+					data: true,
+					success() {
+						
+						uni.switchTab({
+							url:'/pages/index/index'
+						})
+					}
+				});
+			},
+			guideAction(event) {
+				    let that = this,
+					index = event.detail.current;
+				    that.cur = index;
+				// if (index == 0) {
+				// 	that.move(0, 1);
+				// 	that.moveTwo(150, 0.1);
+				// 	that.moveThree(150, 0.1);
+				// 	that.lefMainAction(0);
+				// }
+				// if (index == 1) {
+				// 	that.moveTwo(0, 1);
+				// 	that.move(150, 0.1);
+				// 	that.moveThree(150, 0.1);
+				// 	that.lefMainAction(uni.upx2px(80) + 'px');
+				// }
+				// if (index == 2) {
+				// 	that.moveThree(0, 1);
+				// 	that.moveTwo(150, 0.1);
+				// 	that.move(150, 0.1);
+				// 	that.lefMainAction(uni.upx2px(160) + 'px');
+				// }
+			},
+			lefMainAction(mum) {
+				var testLM = this.$refs.lefMain;
+				animation.transition(
+					testLM, {
+						styles: {
+							transform: 'translate(' + mum + ',0px)'
+						},
+						duration: 400, //ms
+						timingFunction: 'ease',
+						delay: 0 //ms
+					},
+					function() {}
+				);
+			},
+			move(tran, opa) {
+				var testEl = this.$refs.box1;
+				animation.transition(
+					testEl, {
+						styles: {
+							transform: 'translate(' + tran + 'px,0px)',
+							transformOrigin: 'center center',
+							opacity: opa
+						},
+						duration: 800, //ms
+						timingFunction: 'ease',
+						delay: 0 //ms
+					},
+					function() {}
+				);
+				var textE2 = this.$refs.box2;
+				animation.transition(
+					textE2, {
+						styles: {
+							transform: 'translate(0px,' + tran + 'px) scale(' + opa + ')',
+							transformOrigin: 'center center',
+							opacity: opa
+						},
+						duration: 800, //ms
+						timingFunction: 'ease',
+						delay: 0 //ms
+					},
+					function() {}
+				);
+			},
+			moveTwo(tran, opa) {
+				var testEl = this.$refs.box3;
+				animation.transition(
+					testEl, {
+						styles: {
+							transform: 'translate(' + tran + 'px,0px)',
+							transformOrigin: 'center center',
+							opacity: opa
+						},
+						duration: 800, //ms
+						timingFunction: 'ease',
+						delay: 0 //ms
+					},
+					function() {}
+				);
+				var textE2 = this.$refs.box4;
+				animation.transition(
+					textE2, {
+						styles: {
+							transform: 'translate(0px,' + tran + 'px) scale(' + opa + ')',
+							transformOrigin: 'center center',
+							opacity: opa
+						},
+						duration: 800, //ms
+						timingFunction: 'ease',
+						delay: 0 //ms
+					},
+					function() {}
+				);
+			},
+			moveThree(tran, opa) {
+				var testEl = this.$refs.box5;
+				animation.transition(
+					testEl, {
+						styles: {
+							transform: 'translate(' + tran + 'px,0px)',
+							transformOrigin: 'center center',
+							opacity: opa
+						},
+						duration: 800, //ms
+						timingFunction: 'ease',
+						delay: 0 //ms
+					},
+					function() {}
+				);
+				var textE2 = this.$refs.box6;
+				animation.transition(
+					textE2, {
+						styles: {
+							transform: 'translate(0px,' + tran + 'px) scale(' + opa + ')',
+							transformOrigin: 'center center',
+							opacity: opa
+						},
+						duration: 800, //ms
+						timingFunction: 'ease',
+						delay: 0 //ms
+					},
+					function() {}
+				);
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+	
+		min-height: 100%;
+		height: 100%;
+	}
+
+	.guide {
+		width: 100%;
+		height: 100%;
+	}
+
+	
+
+	.image-size {
+		width: 100%;
+		height: 100%;
+	}
+
+	.title-box {
+		padding: 250rpx 0 120rpx 64rpx;
+	}
+
+	.guide-title {
+		font-size: 48rpx;
+		font-weight: bold;
+		color: rgba(58, 61, 68, 1);
+	}
+
+	.guide-subtitle {
+		margin-top: 20rpx;
+		font-size: 35rpx;
+		color: rgba(131, 136, 146, 1);
+		line-height: 50rpx;
+	}
+
+	.footer {
+		width: 231rpx;
+		height: 80rpx;
+		text-align: center;
+		position: fixed;
+		bottom: 116rpx;
+		left: 37%;
+		font-size: 30rpx;
+		color: #FFFFFF;
+		background-color: #2B9939;
+	}
+
+	.btn-box {
+		position: absolute;
+		z-index: 999;
+		right: 40rpx;
+		top: 120rpx;
+	}
+
+	.dots {
+		display: flex;
+		justify-content: center;
+		position: absolute;
+		z-index: 999;
+		height: 151rpx;
+		left: 0;
+		right: 0;
+		bottom: 20rpx;
+	}
+
+	.passbtn {
+		color: #ffffff;
+		text-align: center;
+		border-width: 1rpx;
+		border-color: rgba(255, 255, 255, 0.5);
+		border-style: solid;
+		border-radius: 30rpx;
+		font-size: 28rpx;
+		padding-top: 10rpx;
+		padding-bottom: 10rpx;
+		padding-left: 25rpx;
+		padding-right: 25rpx;
+	}
+
+	.dot {
+		margin: 0 4rpx;
+		width: 15rpx;
+		height: 15rpx;
+		background: #CDD2DD;
+		border-radius: 8rpx;
+		transition: all .6s;
+	}
+
+	.dot.active {
+		width: 40rpx;
+		background: #838892 !important;
+	}
+
+	/* 相对定位 */
+	.zqui-rel {
+		position: relative;
+	}
+
+	.swiper-css {
+		width: 750rpx;
+	}
+
+	.swiper-item {
+		width: 750rpx;
+	}
+</style>

pages/guide/judge.vue

@@ -0,0 +1,34 @@
+<template>
+	<view class="content"></view>
+</template>
+
+<script>
+	export default {
+		onLoad() {
+			this.checkGuide();
+		},
+		methods: {
+			checkGuide() {
+				console.log("进入checkGuide判断页");
+				// 思路： 检测是否有启动缓存，如果没有，就是第一次启动，第一次启动就去 启动介绍页面
+				try {
+					var launchFlag = uni.getStorageSync('launchFlag');
+					// console.log("launchFlag:" + launchFlag);
+					if (launchFlag) { //判断本地缓存跳转首页
+						
+						uni.switchTab({
+							url:'/pages/index/index'
+						})
+					} else { //没有缓存进入启动页引导页
+						console.log('去引导页');
+						uni.redirectTo({
+							url: '/pages/guide/guide'
+						});
+					}
+				} catch (e) {
+					console.log(e.message);
+				}
+			}
+		}
+	};
+</script>

pages/moreProject/moreProject.vue

@@ -135,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>
@@ -157,7 +157,7 @@
 								<image class="icon_img" src="@/static/images/relase.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>