xiaoxin před 9 měsíci
rodič
revize
5ab552d295
4 změnil soubory, kde provedl 30 přidání a 18 odebrání
  1. 8 8
      common/config.js
  2. 18 6
      my/address/add.vue
  3. 1 1
      pages/index/selectCampus.vue
  4. 3 3
      pages/index/shop/index.vue

+ 8 - 8
common/config.js

@@ -3,15 +3,15 @@
 // const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"
 // const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"
 // const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"
 // const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"
 
 
-// const ROOTPATH = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
-// const ROOTPATH1 = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
-// const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss-test/websocket/"
-// const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss-test/ordersChat/"
+const ROOTPATH = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
+const ROOTPATH1 = "https://mxys.chuanghai-tech.com/wm-test/wm-api/sqx_fast";
+const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss-test/websocket/"
+const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss-test/ordersChat/"
 
 
-const ROOTPATH = "http://192.168.161.190:8171/sqx_fast";
-const ROOTPATH1 = "http://192.168.161.190:8171/sqx_fast";
-const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"
-const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"
+// const ROOTPATH = "http://192.168.161.190:8171/sqx_fast";
+// const ROOTPATH1 = "http://192.168.161.190:8171/sqx_fast";
+// const ROOTPATH2 = "wss://mxys.chuanghai-tech.com/wss/websocket/"
+// const ROOTPATH3 = "wss://mxys.chuanghai-tech.com/wss/ordersChat/"
 
 
 
 
 module.exports = {
 module.exports = {

+ 18 - 6
my/address/add.vue

@@ -116,6 +116,9 @@
 			}
 			}
 		},
 		},
 		onLoad(option) {
 		onLoad(option) {
+			this.getSetData()
+			this.getStationData(option.page)
+			
 			this.XCXIsSelect = this.$queue.getData('XCXIsSelect') ? this.$queue.getData('XCXIsSelect') : '是';
 			this.XCXIsSelect = this.$queue.getData('XCXIsSelect') ? this.$queue.getData('XCXIsSelect') : '是';
 			if (this.XCXIsSelect == '否') {
 			if (this.XCXIsSelect == '否') {
 				this.getGuize()
 				this.getGuize()
@@ -127,8 +130,7 @@
 					title: '添加地址'
 					title: '添加地址'
 				});
 				});
 			}
 			}
-			this.getSetData()
-			this.getStationData()
+			
 			this.id = option.id
 			this.id = option.id
 			if (option.id) {
 			if (option.id) {
 				this.getAddressDet(option.id)
 				this.getAddressDet(option.id)
@@ -149,11 +151,22 @@
 					}
 					}
 				});
 				});
 			},
 			},
-			getStationData(){
+			getStationData(page){
 				this.$Request.get("/app/riderStation/stationList").then(res => {
 				this.$Request.get("/app/riderStation/stationList").then(res => {
-					// console.log(res);
+					console.log(res);
 					if(res.code == 0){
 					if(res.code == 0){
 						this.stationList = res.data
 						this.stationList = res.data
+						
+						if(page){
+							this.stationList.forEach((ele,index)=>{
+								if(ele.stationName =='墨轩湖校区'){
+									this.stationIndex = index
+									this.stationId = this.stationList[this.stationIndex].id
+									this.form.address =this.stationList[this.stationIndex].stationName
+									this.getAddress(this.stationId ,false)
+								}
+							})
+						}
 					}
 					}
 				});
 				});
 			},
 			},
@@ -435,8 +448,7 @@
 	page {
 	page {
 		background-color: #fff !important;
 		background-color: #fff !important;
 	}
 	}
-
-	/* 添加收货地址 */
+	
 	.btn {
 	.btn {
 		position: fixed;
 		position: fixed;
 		bottom: 100rpx;
 		bottom: 100rpx;

+ 1 - 1
pages/index/selectCampus.vue

@@ -251,7 +251,7 @@ export default {
 				return
 				return
 			}
 			}
 			uni.navigateTo({
 			uni.navigateTo({
-				url: '/my/address/add'
+				url: '/my/address/add?page=2'
 			})
 			})
 		}
 		}
 	},
 	},

+ 3 - 3
pages/index/shop/index.vue

@@ -641,7 +641,7 @@ export default {
 			lng: '',
 			lng: '',
 			shopName: '',
 			shopName: '',
 			page: 1,
 			page: 1,
-			limit: 12,
+			limit: 50,
 			total: 0,
 			total: 0,
 			evaluatePage: 1,
 			evaluatePage: 1,
 			evaluateLimit: 10,
 			evaluateLimit: 10,
@@ -776,7 +776,7 @@ export default {
 			}
 			}
 		},
 		},
 		scrolltolower_left() {
 		scrolltolower_left() {
-			console.log(111)
+			// console.log(111)
 			if (this.total > this.dataList.length) {
 			if (this.total > this.dataList.length) {
 				this.page++
 				this.page++
 				this.getData()
 				this.getData()
@@ -788,7 +788,7 @@ export default {
 			}
 			}
 		},
 		},
 		scrolltolower_right() {
 		scrolltolower_right() {
-			console.log(222)
+			// console.log(222)
 			if (this.total > this.dataList.length) {
 			if (this.total > this.dataList.length) {
 				this.page++
 				this.page++
 				this.getData()
 				this.getData()