上传

App.vue

@@ -4,7 +4,7 @@
 			this.$store.commit('initConfig')
 		},
 		onShow: function() {
-			this.$store.commit('getGasStationList')
+			// this.$store.commit('getGasStationList')
 		},
 		onHide: function() {
 		}

config.js

@@ -14,7 +14,8 @@ const type = 'prod2'
 const config = {
 	dev : {
 		// baseUrl : 'http://8.138.162.67:8000/a-notice-api',
-		baseUrl : 'http://h5.xzaiyp.top/cheer-admin',
+		// baseUrl : 'http://h5.xzaiyp.top/cheer-admin',
+		baseUrl : 'http://h5.xzaiyp.top/cheer-prod',
 	},
 	prod : {//第一版本生产环境
 		baseUrl : 'https://cheer-admin.xzaiyp.top/cheer-admin',

pages/payment/payment.vue

@@ -4,8 +4,6 @@
 
 		<view class="container">
 			
-			{{ scene }}
-			
 			<uni-section title="当前加油站" 
 			type="line" 
 			titleFontSize="34rpx"></uni-section>
@@ -16,7 +14,7 @@
 						{{ gasStation.name }}
 					</view>
 				</view>
-				<view class="oil-item"
+				<!-- <view class="oil-item"
 				style="margin-left: 20rpx;">
 					<view class="oil"
 					style="display: flex;
@@ -26,7 +24,7 @@
 					@click="$refs.popup.open()">
 						选择站点
 					</view>
-				</view>
+				</view> -->
 			</view>
 			
 			<!-- <view class="tip">
@@ -147,25 +145,47 @@
 			}
 		},
 		onShow() {
-			if(!this.scene && !this.gasStation.id){
-				this.$refs.popup.open()
-			}else{
-				this.gasStationList.forEach(n => {
-					if(n.id == this.scene){
-						this.$store.commit('setGasStation', n)
-					}
-				})
-				this.$nextTick(n => {
-					this.getRechargePage()
-				})
-			}
+			this.getGasStationList()
 		},
 		onLoad (query) {
 		    // scene 需要使用 decodeURIComponent 才能获取到生成二维码时传入的 scene
-		    const scene = decodeURIComponent(query.scene || '')
+		    const scene = query.shareId
+		    // const scene = decodeURIComponent(query.scene || '')
 			this.scene = scene
 		},
 		methods: {
+			//获取加油站列表
+			getGasStationList(){
+				this.$api('getGasStationList', {
+					pageNo : 1,
+					pageSize : 9999999
+				}, res => {
+					if(res.code == 200){
+						// state.gasStationList = res.result.records
+						this.$store.commit('setGasStationList', res.result.records)
+						
+						console.log(res.result.records, this.scene);
+						
+						if(!this.scene && !this.gasStation.id){
+							// this.$refs.popup.open()
+							// 默认第一个
+							this.$store.commit('setGasStation', res.result.records[0])
+						}else{
+							res.result.records.forEach(n => {
+								if(n.id == this.scene){
+									console.log(n);
+									this.$store.commit('setGasStation', n)
+								}
+							})
+						}
+						
+						this.$nextTick(n => {
+							this.getRechargePage()
+						})
+						
+					}
+				})
+			},
 			
 			setGasStation(data){
 				this.$store.commit('setGasStation', data)

store/store.js

@@ -75,6 +75,9 @@ const store = new Vuex.Store({
 			state.gasStation = data
 			this.commit('twogetConfig')
 		},
+		setGasStationList(state, data){
+			state.gasStationList = data
+		},
 		login(state) {
 			uni.showLoading({
 				title:"登录中..."