liuf 1 jaar geleden
bovenliggende
commit
b95d407c85
3 gewijzigde bestanden met toevoegingen van 25 en 4 verwijderingen
  1. 3 0
      manifest.json
  2. 10 0
      pages.json
  3. 12 4
      pages/index/index.vue

+ 3 - 0
manifest.json

@@ -14,6 +14,9 @@
 			"autoclose": true,
 			"delay": 0
 		},
+		"compatible":{
+			  "ignoreVersion" : true
+		},
 		"modules": {
 			"Bluetooth": {},
 			"Barcode": {},

+ 10 - 0
pages.json

@@ -68,5 +68,15 @@
 			"get-coupon": "plugin://couponPlugin/get-coupon"
 			
 		}
+	},
+	"condition" : { //模式配置,仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [
+			{
+				"name": "", //模式名称
+				"path": "", //启动页面,必选
+				"query": "" //启动参数,在页面的onLoad函数里面得到
+			}
+		]
 	}
 }

+ 12 - 4
pages/index/index.vue

@@ -246,9 +246,9 @@
 			</view>
 
 
-			<view v-for="item in params_sort" :key="item.index">
+			<view v-for="item in params_sort" >
 				<view v-if="!isempty(item.mny)" class="pay-btn-content" style="position: relative;">
-					<view @click="selectmenu(item.mny);" :id="' '+item.mny" class="pay-btn item-tc"
+					<view @click="selectmenu(item.mny)" :id="''+item.mny" class="pay-btn item-tc"
 						style="color: #454955;text-align: left;" :class="total==item.mny?'item-selected':''">
 						<view class="weui-flex3" style="padding: 6px 15px 0px 15px;font-size: 15px;font-weight: bold;">
 							<view>
@@ -442,6 +442,7 @@
 				sessionId: '',
 				device_sn: '',
 				visible: false,
+				hasPop:false,
 				title: '',
 				showMask: true,
 				// alipay
@@ -465,7 +466,9 @@
 		},
 		onReady() {
 			if (this.device_sn == '') {
-				this.$refs.popupclose.open("center")
+				console.log("");
+				this.mycenter();
+				//this.$refs.popupclose.open("center")
 			}
 			//this.$refs.popupmarketings.open("center")
 		},
@@ -515,12 +518,13 @@
 			this.$scope.onClose = this.onClose.bind(this)
 			this.$scope.onAdError = this.onAdError.bind(this)
 			//保险
+			
 			var _this = this
 			_this.device_sn = uni.getStorageSync("device_sn")
 			_this.title = uni.getStorageSync("title")
 			_this.sessionId = 'we7sid-' + uni.getStorageSync("sessionId")
 			// _this.device_sn = 'GD1B406633'
-			// _this.sessionId = 'we7sid-' + 'f64fc115f096fda78171e6b4ec960cd4';
+			// _this.sessionId = 'we7sid-' + '9908b0533fb8af82dba4cd59daa93870';
 			uni.setNavigationBarTitle({
 				title: _this.title
 			})
@@ -581,7 +585,11 @@
 				my.exitMiniProgram();
 			},
 			onShowBtn() {
+				if(this.hasPop){
+					return;
+				}
 				this.visible = true
+				this.hasPop=true
 			},
 			onPopupClose() {
 				this.visible = false