修复导入饼时取消选择错误问题

Mfweb · Oct 4, 2018 · 7e2f677 · 7e2f677
1 parent 054baa4
commit 7e2f677
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/AdaoMemberSystem/pages/app-cookie/app-cookie.js b/AdaoMemberSystem/pages/app-cookie/app-cookie.js
@@ -53,6 +53,12 @@ Page({
   },
   onTapCheckbox: function(res) {
     var detail = this.data.CookieList[res.currentTarget.id].detail;
+    if (this.data.CookieList[res.currentTarget.id].checked == true) {
+      this.data.CookieList[res.currentTarget.id].checked = false;
+      this.setData({ CookieList: this.data.CookieList});
+      console.log(this.data.returnJson);
+      return;
+    }
     if (detail == undefined || detail == null || detail == '') {
       this.setData({ disableCheckbox: true, disableLaunch: true});
       this.getDetail(res.currentTarget.id);

diff --git a/AdaoMemberSystem/pages/app-cookie/app-cookie.wxml b/AdaoMemberSystem/pages/app-cookie/app-cookie.wxml
@@ -24,5 +24,8 @@
   <view class='message'>
     请注意，如果确定导入饼干，则APP可以获取饼干内容（不会获得饼干显示名以及实名内容），请确定调用小程序的APP是否是需要导入饼干的APP，否则可能有变RBQ的风险。
   </view>
+  <view class='message'>
+    紫岛只支持导入1个饼干，如果点击导入后没有返回APP请重新从APP调用。
+  </view>
   <button open-type="launchApp" app-parameter="{{returnJson}}" binderror="onLaunchAppError" bindtap='onTapReturn' disabled="{{disableLaunch}}"  class="nButton" type="primary">确认导入选中的饼干</button>
 </view>
diff --git a/AdaoMemberSystem/pages/index/index.js b/AdaoMemberSystem/pages/index/index.js
@@ -40,7 +40,11 @@ Page({
     this.switchPage(0);
     wx.showNavigationBarLoading();
     this.showNotice(function () {
-      //app.globalData.SystemInfo.Scene = 1069;
+      //1078用来测试的，因为小程序调试工具不支持1069
+      if (app.globalData.SystemInfo.Scene == 1078) {
+        app.globalData.SystemInfo.Scene = 1069;
+        pageEvent.mode = 'cookie';
+      }
       memberMode = 0;
       if (app.globalData.SystemInfo.Scene == 1069) {//通过APP拉起
         if (pageEvent.mode != undefined && pageEvent.mode == 'reg') {

diff --git a/AdaoMemberSystem/project.config.json b/AdaoMemberSystem/project.config.json
@@ -30,7 +30,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 3,
+			"current": 1,
 			"list": [
 				{
 					"id": -1,
@@ -44,7 +44,7 @@
 					"name": "APP调用获取饼干",
 					"pathName": "pages/index/index",
 					"query": "mode=cookie",
-					"scene": "1054"
+					"scene": "1078"
 				},
 				{
 					"id": -1,