优化

components/module/listTemplate/commodityList.vue

@@ -103,7 +103,7 @@
 			toLoginPage() {
 				const {lastPageType, lastPageVal} = this.$parent;
 				uni.navigateTo({
-					url:`/pages/user-module/login-accont?listType=${lastPageType}&listVal=${lastPageVal}`
+					url:`/pages/login/login-accont?listType=${lastPageType}&listVal=${lastPageVal}`
 				})
 			},
 			toLower() {

components/module/noLogin/nologin.vue

@@ -64,13 +64,13 @@
 				let self = this
 				let url;
 				if(self.alertType =='3'){
-					url =`/pages/user-module/login-accont?type=1`
+					url =`/pages/login/login-accont?type=1`
 					this.$parent.isShowNoLogin=false;
 				}else if(self.alertType =='4'){
-					url =`/pages/user-module/login-accont?type=2`
+					url =`/pages/login/login-accont?type=2`
 					this.$parent.isShowNoLogin=true;
 				}else{
-					url=`/pages/user-module/login-accont?type=detilType&id=${self.productids}`
+					url=`/pages/login/login-accont?type=detilType&id=${self.productids}`
 					this.$parent.isShowNoLogin=false;
 				}
 				uni.navigateTo ({

home.vue

@@ -77,7 +77,7 @@
 									<text class="p big">{{item.retailPrice.toFixed(2)}}</text>
 								</view>
 								<view v-else class="no-price">							
-									<text vi-else class="p-no tui-skeleton-rect" @click.stop="navto('/pages/user-module/login?type=3')">登录查看价格<text class="iconfont icon-xiayibu" style="font-size: 22rpx;margin: 0 6rpx;"></text></text>
+									<text vi-else class="p-no tui-skeleton-rect" @click.stop="navto('/pages/login/login?type=3')">登录查看价格<text class="iconfont icon-xiayibu" style="font-size: 22rpx;margin: 0 6rpx;"></text></text>
 								</view>		
 							</view>
 						</view>

pages.json

@@ -162,45 +162,45 @@
 				"navigationBarTitleText": "搜索"
 			}
 		},{
-			"path": "pages/user-module/register",
+			"path": "pages/login/register",
 			"style": {
 				"navigationBarTitleText": "注册",
 				"navigationStyle":"custom"
 			}
 		},{
-			"path": "pages/user-module/login",
+			"path": "pages/login/login",
 			"style": {
 				"navigationBarTitleText": "授权登录"
 			}
 		},{
-			"path": "pages/user-module/login-accont",
+			"path": "pages/login/login-accont",
 			"style": {
 				"navigationBarTitleText": "登录"
 			}
 		},{
-			"path": "pages/user-module/bindemail",
+			"path": "pages/login/bindemail",
 			"style": {
 				"navigationBarTitleText": "绑定邮箱"
 			}
 		},{
-			"path": "pages/user-module/bindwechat",
+			"path": "pages/login/bindwechat",
 			"style": {
 				"navigationBarTitleText": "绑定微信"
 			}
 		},{
-			"path": "pages/user-module/apply",
+			"path": "pages/login/apply",
 			"style": {
 				"navigationBarTitleText": "修改申请资料",
 				"navigationStyle":"custom"
 			}
 		},{
-			"path": "pages/user-module/information",
+			"path": "pages/login/information",
 			"style": {
 				"navigationBarTitleText": "修改资料",
 				"navigationStyle":"custom"
 			}
 		},{
-			"path": "pages/user-module/password",
+			"path": "pages/login/password",
 			"style": {
 				"navigationBarTitleText": "修改密码"
 			}
@@ -238,10 +238,10 @@
     ],
 	"subPackages": [
 			{
-				"root": "user",
+				"root": "extend",
 				"pages": [
 					{
-						"path": "register/register",
+						"path": "pages/register/register",
 						"style": {
 							"navigationBarTitleText": "注册",
 							"navigationStyle":"custom"

pages/goods/product.vue

@@ -366,14 +366,14 @@
 				if(this.hasLogin){
 					this.$api.switchTabTo('/pages/tabBar/cart/cart')
 				}else{
-					this.$api.navigateTo('/pages/user-module/login-accont?type=1')
+					this.$api.navigateTo('/pages/login/login-accont?type=1')
 				}
 			},
 			btnGetConfirm(type){//加入购物车&&立即购买点击
 				if(this.hasLogin){
 					this.showSpec(type);
 				}else{
-					this.$api.navigateTo('/pages/user-module/login-accont?type=1')
+					this.$api.navigateTo('/pages/login/login-accont?type=1')
 				}
 			},	
 			changeCountAdd(){//popup弹窗数量增加按钮
@@ -458,7 +458,7 @@
 				})
 			},
 			navToLogin(){
-				this.$api.navigateTo(`/pages/user-module/login-accont?type=detilType&id=${this.productID}`)
+				this.$api.navigateTo(`/pages/login/login-accont?type=detilType&id=${this.productID}`)
 			},
 			setHeaderBtnPosi(){
 				// 获得胶囊按钮位置信息

pages/user-module/bindemail.vue → pages/login/bindemail.vue

@@ -84,14 +84,14 @@
 							url:'/pages/tabBar/user/user'
 						})
 					}else{
-						this.$api.navigateTo(`/pages/user-module/bindwechat?data=${JSON.stringify(this.getOption)}&type=${this.loginType}`)
+						this.$api.navigateTo(`/pages/login/bindwechat?data=${JSON.stringify(this.getOption)}&type=${this.loginType}`)
 					}
 				}).catch(response =>{
 					this.$util.msg(response.msg,2000)
 				})
 			},
 			bindEmailNone(){
-				this.$api.navigateTo(`/pages/user-module/bindwechat?data=${JSON.stringify(this.getOption)}&type=${this.loginType}`)
+				this.$api.navigateTo(`/pages/login/bindwechat?data=${JSON.stringify(this.getOption)}&type=${this.loginType}`)
 			},
 			getEmailCodeFn(){
 				if( this.bindEmail == ''){

pages/user-module/login-accont.vue → pages/login/login-accont.vue

@@ -19,12 +19,12 @@
 				<view class="iconfont" :class="isShowEye ? iconEyen : iconEyes"  @click="passwordClick"></view>
 			</view>
 			<view class="login-input link">
-				<view class="login-reg" @click.stop="this.$api.navigateTo('/pages/user-module/register')">免费注册</view>
-				<view class="login-pwd" @click.stop="this.$api.navigateTo('/pages/user-module/password')">忘记密码?</view>
+				<view class="login-reg" @click.stop="this.$api.navigateTo('/pages/login/register')">免费注册</view>
+				<view class="login-pwd" @click.stop="this.$api.navigateTo('/pages/login/password')">忘记密码?</view>
 			</view>
 		</view>
 		<view class="login-btn"  @click="confirmLogin">登录</view>
-		<view class="login-btn-last" @click.stop="this.$api.navigateTo(`/pages/user-module/login?data=${getOption}`)">邀请码登录</view>
+		<view class="login-btn-last" @click.stop="this.$api.navigateTo(`/pages/login/login?data=${getOption}`)">邀请码登录</view>
 		<view class="login-tel">客服热线：0755-22907771</view>
 	</view>
 </template>
@@ -69,14 +69,14 @@
 				organizationLogin(params).then(response =>{
 					if(response.code == '0' ){
 						this.storeUpdataeStatus(response.data)
-						this.$api.navigateTo(`/pages/user-module/bindwechat?data=${JSON.stringify(this.getOption)}&codeType=${response.code}`)
+						this.$api.navigateTo(`/pages/login/bindwechat?data=${JSON.stringify(this.getOption)}&codeType=${response.code}`)
 					}else if(response.code == '4'){
 						this.storeUpdataeStatus(response.data)					
-						this.$api.navigateTo(`/pages/user-module/bindemail?data=${JSON.stringify(this.getOption)}&codeType=${response.code}`)
+						this.$api.navigateTo(`/pages/login/bindemail?data=${JSON.stringify(this.getOption)}&codeType=${response.code}`)
 					}else if(response.code == '-3'){
 						this.storeUpdataeStatus(response.data)
 						this.$util.modal('',response.msg,'前往修改','',false,() =>{
-							 this.$api.navigateTo('/pages/user-module/apply')
+							 this.$api.navigateTo('/pages/login/apply')
 						})
 					}else{
 						this.$util.msg(response.msg,2000);

pages/user-module/login.vue → pages/login/login.vue

@@ -68,7 +68,7 @@
 								})
 							}else if(response.code == 4){
 								this.login(response.data)
-								this.$api.navigateTo(`/pages/user-module/bindemail?data=${JSON.stringify(this.getOption)}&pathType=1`)
+								this.$api.navigateTo(`/pages/login/bindemail?data=${JSON.stringify(this.getOption)}&pathType=1`)
 							}else{
 								this.$util.msg(response.msg,2000)
 								this.isUserInfo = false

pages/search/search.vue

@@ -220,7 +220,7 @@
 			toLoginPage() {
 				let searchLoginType = 'search'
 				uni.navigateTo({
-					url:`/pages/user-module/login-accont?type=${searchLoginType}`
+					url:`/pages/login/login-accont?type=${searchLoginType}`
 				})
 			}
 		},

pages/tabBar/cart/cart.vue

@@ -161,7 +161,7 @@
 				})	
 			},
 			initLogin(){
-				this.$api.redirectTo('/pages/user-module/login-accont?type=4')
+				this.$api.redirectTo('/pages/login/login-accont?type=4')
 			},
 			setScrollHeight() {
 				// 窗口高度-footer高度

pages/tabBar/user/user.vue

@@ -132,7 +132,7 @@
 				isShowNoLogin:false,
 				firstList:[
 					{name:'运营人员管理',path:'/pages/user/operator/list'},
-					{name:'机构资料',path:'/pages/user-module/information'},
+					{name:'机构资料',path:'/pages/login/information'},
 					{name:'收货地址管理',path:'/pages/user/address/address'}
 				],
 				twoList:[
@@ -203,7 +203,7 @@
 			onShow(){
 				if(!this.hasLogin){
 					this.isShowNoLogin = true;
-					this.$api.redirectTo('/pages/user-module/login-accont?type=4')
+					this.$api.redirectTo('/pages/login/login-accont?type=4')
 					this.$store.commit('updateAllNum',0)
 				}else{
 					this.$api.getStorage().then((resolve) =>{

pages/user/address/address.vue

@@ -129,7 +129,7 @@
 			},
 			addAddress(type,item){
 				uni.navigateTo({
-					url: `/pages/user/address/addressManage?type=${type}&data=${JSON.stringify(item)}`
+					url: `/user/address/addressManage?type=${type}&data=${JSON.stringify(item)}`
 				})
 			},
 			//删除收货地址

pages/user/operator/addoperator.vue

@@ -11,7 +11,7 @@
 				<button class="add-btn" @click="confirm">确定</button>
 			</view>
 			<view class="operator-text">
-				<view class="title" @click="this.$api.navigateTo('/pages/user/operator/bindstep')">
+				<view class="title" @click="this.$api.navigateTo('/user/operator/bindstep')">
 					<text class="iconfont icon-gantanhao-yuankuang"></text>
 					<text class="text-m">运营人员绑定步骤</text>
 					<text class="text-s">（点击查看图片引导）</text>

pages/user/operator/list.vue

@@ -59,7 +59,7 @@
 			</view>
 		</view>
 		<div class="operator-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '0rpx'}">
-			<view class="add-btn" @click="this.$api.navigateTo('/pages/user/operator/addoperator')">添加运营人员</view>
+			<view class="add-btn" @click="this.$api.navigateTo('/user/operator/addoperator')">添加运营人员</view>
 		</div>
 		<view class="operator-model" v-if="isOperatorModel" @click.stop="closeModel">
 			<view class="operator-alert">

pages/user/order/create-order.vue

@@ -211,7 +211,7 @@
 					if(response.code === 1){
 						this.submitState ='success'
 						let data = {orderID:response.data.orderID}
-						this.$api.navigateTo(`/pages/user/order/order-cashier?type=${this.submitState}&data=${JSON.stringify({data:data})}`)
+						this.$api.navigateTo(`/user/order/order-cashier?type=${this.submitState}&data=${JSON.stringify({data:data})}`)
 					}else if(response.code === 2){
 						this.submitState ='nosuccess'
 						let data = {
@@ -220,7 +220,7 @@
 								orderMark:response.data.orderMark,
 								payableAmount:response.data.payableAmount
 						}
-						this.$api.navigateTo(`/pages/user/order/order-cashier?type=${this.submitState}&data=${JSON.stringify({data:data})}`)
+						this.$api.navigateTo(`/user/order/order-cashier?type=${this.submitState}&data=${JSON.stringify({data:data})}`)
 					}else{
 						this.$util.msg(response.msg,2000);
 					}

pages/user/order/myOrder.vue

@@ -247,7 +247,7 @@
 			},
 			detail(id) {//订单详情跳转
 				this.isModalLayer = true;	
-				this.$api.navigateTo(`/pages/user/order/order-details?state=${this.currentTab}&orderID=${id}`)
+				this.$api.navigateTo(`/user/order/order-details?state=${this.currentTab}&orderID=${id}`)
 			},
 			handButtonConfirm(data) {//获取点击
 				console.log('点击按钮的类型是',data);
@@ -264,7 +264,7 @@
 						break
 					case 'query':
 						this.isModalLayer = true;
-						this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+data.orderId)
+						this.$api.navigateTo('/user/order/order-logistics?orderID='+data.orderId)
 						break
 					case 'confirm':
 						this.handOrderConfirm(data.orderId);
@@ -325,7 +325,7 @@
 			    }
 				return {
 					title: '您有新的分享订单，快来查看吧~',
-					path: `/pages/user/order/orderShareLogin?orderID=${this.btnoRderID}&userID=${this.userID}`,
+					path: `/user/order/orderShareLogin?orderID=${this.btnoRderID}&userID=${this.userID}`,
 					imageUrl:'https://img.caimei365.com/group1/M00/03/8C/Cmis215XHXSAWWkhAAXDP4-6m_c397.png'
 				}
 			},

pages/user/order/order-cashier.vue

@@ -31,7 +31,7 @@
 				</view>	
 				<view class="cash-btn" :style="{paddingBottom :isIphoneX ? '68rpx' : '20rpx'}">
 					<view class="btn btn-share" @click="onShareCode">分享订单<view class="tips" v-if="isShareCode">分享码：{{shareCode}}</view></view>
-					<view class="btn btn-query" @click="this.$api.navigateTo('/pages/user/order/order-details?type=confim&orderID='+shareOrderID)">查看订单</view>
+					<view class="btn btn-query" @click="this.$api.navigateTo('/user/order/order-details?type=confim&orderID='+shareOrderID)">查看订单</view>
 					<view class="btn btn-makes" @click="this.$api.switchTabTo('/pages/tabBar/home/home')">继续采购</view>
 				</view>
 			</view>
@@ -162,7 +162,7 @@
 			    }
 				return {
 					title: '您有新的分享订单，快来查看吧~',
-					path: `/pages/user/order/orderShareLogin?orderID=${this.shareOrderID}&userID=${this.userID}`,
+					path: `/user/order/orderShareLogin?orderID=${this.shareOrderID}&userID=${this.userID}`,
 					imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/03/%E8%AE%A2%E5%8D%95%E5%88%86%E4%BA%AB%E5%9B%BE%403x.png'
 				}
 			},

pages/user/order/order-details.vue

@@ -138,7 +138,7 @@
 						this.handCenceConfirm();
 						break
 					case 'query':
-						this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+this.orderID)
+						this.$api.navigateTo('/user/order/order-logistics?orderID='+this.orderID)
 						break
 					case 'confirm':
 						this.handOrderConfirm()
@@ -162,7 +162,7 @@
 							if(this.shareType ==='share'){
 								this.$api.switchTabTo('/pages/tabBar/user/user')
 							}else{
-								this.$api.redirectTo(`/pages/user/order/order-list?type=detele&state=${this.state}`)
+								this.$api.redirectTo(`/user/order/order-list?type=detele&state=${this.state}`)
 							}
 						},500)
 					}).catch(response =>{
@@ -188,7 +188,7 @@
 			    }
 				return {
 					title: '您有新的分享订单，快来查看吧~',
-					path: `/pages/user/order/orderShareLogin?orderID=${this.orderID}&userID=${this.userID}`,
+					path: `/user/order/orderShareLogin?orderID=${this.orderID}&userID=${this.userID}`,
 					imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/03/%E8%AE%A2%E5%8D%95%E5%88%86%E4%BA%AB%E5%9B%BE%403x.png'
 				}
 			},

pages/user/order/order-list.vue

@@ -285,7 +285,7 @@
 			detail(id) {//订单详情跳转
 				console.log(id)
 				this.isModalLayer = true;	
-				this.$api.navigateTo(`/pages/user/order/order-details?state=${this.currentTab}&orderID=${id}`)
+				this.$api.navigateTo(`/user/order/order-details?state=${this.currentTab}&orderID=${id}`)
 			},
 			handButtonConfirm(data) {//获取点击
 				console.log('点击按钮的类型是',data);
@@ -302,7 +302,7 @@
 						break
 					case 'query':
 						this.isModalLayer = true;
-						this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+data.orderId)
+						this.$api.navigateTo('/user/order/order-logistics?orderID='+data.orderId)
 						break
 					case 'confirm':
 						this.handOrderConfirm(data.orderId);
@@ -355,7 +355,7 @@
 			    }
 				return {
 					title: '您有新的分享订单，快来查看吧~',
-					path: `/pages/user/order/orderShareLogin?orderID=${this.btnoRderID}&userID=${this.userID}`,
+					path: `/user/order/orderShareLogin?orderID=${this.btnoRderID}&userID=${this.userID}`,
 					imageUrl:'https://admin-b.caimei365.com/userfiles/1/images/photo/2020/03/%E8%AE%A2%E5%8D%95%E5%88%86%E4%BA%AB%E5%9B%BE%403x.png'
 				}
 			},

pages/user/order/order-sharedetails.vue

@@ -98,7 +98,7 @@
 				})
 			},
 			queryLogistics(){//跳转查询物流页面
-				this.$api.navigateTo('/pages/user/order/order-logistics?orderID='+this.orderID)
+				this.$api.navigateTo('/user/order/order-logistics?orderID='+this.orderID)
 			},
 		},
 		onShow() {

pages/user/order/orderShareLogin.vue

@@ -49,10 +49,10 @@
 						if (response.code === 0) {
 							if(response.data == true){
 								console.log('同为会所运营人员查看订单详情')
-								this.$api.navigateTo(`/pages/user/order/order-details?type=share&orderID=${this.orderID}`)
+								this.$api.navigateTo(`/user/order/order-details?type=share&orderID=${this.orderID}`)
 							}else{
 								console.log('游客第二次查看订单详情')
-								this.$api.redirectTo(`/pages/user/order/order-sharedetails?orderID=${this.orderID}`)
+								this.$api.redirectTo(`/user/order/order-sharedetails?orderID=${this.orderID}`)
 							}
 						}else if(response.code === -2){
 							this.$util.modal('提示',response.msg,'确定','',false,() =>{
@@ -83,7 +83,7 @@
 					orderShareCode(params).then(response =>{
 						if (response.code === 0) {
 							console.log('游客第一次查看订单详情')
-							this.$api.redirectTo('/pages/user/order/order-sharedetails?orderID='+this.orderID)
+							this.$api.redirectTo('/user/order/order-sharedetails?orderID='+this.orderID)
 						}else{
 							this.$util.msg(response.msg,2000);
 						}

pages/user/regularPurchase/regularPurchase.vue

@@ -124,7 +124,7 @@
 						id:this.handleData.productID,
 						productCount:this.number
 				}	
-				this.$api.navigateTo(`/pages/user/order/create-order?type=prodcut&data=${JSON.stringify({data:productStp})}`)
+				this.$api.navigateTo(`/user/order/create-order?type=prodcut&data=${JSON.stringify({data:productStp})}`)
 				setTimeout(() => {
 					this.specClass = 'none';
 				}, 200);

pages/user/setting/password.vue

@@ -134,7 +134,7 @@
 			},
 			addAddress(type,item){
 				uni.navigateTo({
-					url: `/pages/user/address/addressManage?type=${type}&data=${JSON.stringify(item)}`
+					url: `/user/address/addressManage?type=${type}&data=${JSON.stringify(item)}`
 				})
 			},
 			//删除收货地址

pages/user/setting/phone.vue

@@ -134,7 +134,7 @@
 			},
 			addAddress(type,item){
 				uni.navigateTo({
-					url: `/pages/user/address/addressManage?type=${type}&data=${JSON.stringify(item)}`
+					url: `/user/address/addressManage?type=${type}&data=${JSON.stringify(item)}`
 				})
 			},
 			//删除收货地址