十全十美、文创默认、抽奖记录

app.js

@@ -38,7 +38,7 @@ App({
         // 获取前端配置文件
         commonApi._post("pbservice/Other/getClientConfig", {unique_key: "wechatxcx"}).then(res => {
             let data = JSON.parse(res.data);
-            data.isTest = data.isTest152? true : false;
+            data.isTest = data.isTest154? true : false;
             data.indexSeason = null
             this.globalData.configJson = data
         }).then(() => {

pages/info/postProductInfo/index.js

@@ -320,7 +320,8 @@ Page({
                     return;
                 }
                 this.setData({
-                    skuFlag: "cart"
+                    skuFlag: "cart",
+                    user_type: this.data.info.sku[this.data.skuIndex].use_type>1?null:this.data.info.sku[this.data.skuIndex].use_type
                 })
                 let that = this
                 wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
@@ -354,7 +355,7 @@ Page({
         this.setData({
             skuIndex: index,
             swiperCurrent: index+this.data.swiperRange.picture.max+1,
-            user_type: null,
+            user_type: this.data.info.sku[index].use_type>1?null:this.data.info.sku[index].use_type,
         })
     },
 

pages/list/six/index.wxml

@@ -1,6 +1,6 @@
 <!--pages/list/six/index.wxml-->
 <!-- <search bind:onload="search"></search> -->
-<title title="十全十美"></title>
+<title title="苏邑十景"></title>
 
 <!-- <image lazy-load src="https://resource.sz-trip.com/uploads/20190831/3ecfcb81bab36027606676737788110c.png" mode="aspectFill" class="topbg"></image> -->
 <image lazy-load src="{{areas[areaIndex].img}}" mode="widthFix" class="bannerImg"  data-event="{{areas[areaIndex]}}" bindtap="gotoPath"></image>

pages/order/pay/index.js

@@ -441,11 +441,11 @@ Page({
                                 title: '您的支付密码已过期',
                                 content: resCode,
                                 cancelText: '修改密码',
-                                confirmText:'忘记密码',
+                                confirmText:'重置密码',
                                 confirmColor:"#0E8790",
                                 success(res){
                                     if (res.confirm) {
-                                        console.log('忘记密码')
+                                        console.log('重置密码')
                                         _this.goReset()
                                       } else if (res.cancel) {
                                         console.log('修改密码')

pages/order/pay/index.wxml

@@ -137,7 +137,7 @@
         </view>
         
         <view class="resetPassword">
-            <view bind:tap="goReset" url="/subPackages/password/setting/setting?type=reset">忘记密码</view>
+            <view bind:tap="goReset" url="/subPackages/password/setting/setting?type=reset">重置密码</view>
         </view>
     </view>
 

pages/user/user.wxml

@@ -66,9 +66,10 @@
     <!-- <navigator url="order/team/list" class="user-box-line" catchtap="pagePoint" data-event="mine_teamorder">
       团体预约订单
     </navigator> -->
-    <navigator url="videoCoupon/index" class="user-box-line">
+    <navigator url="/pages/pbService/web/index?weburl=https://m.cloud.sz-trip.com/PrizeLog" class="user-box-line">
     		中奖记录
     </navigator>
+    
     <!-- <navigator url="service/index" class="user-box-line" catchtap="pagePoint" data-event="mine_customerservice">
       在线客服
     </navigator> -->

project.config.json

@@ -1,102 +1,102 @@
 {
-  "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
-  "setting": {
-    "urlCheck": false,
-    "es6": true,
-    "enhance": true,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": true,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "packNpmRelationList": [
-      {
-        "packageJsonPath": "./package.json",
-        "miniprogramNpmDistDir": "./miniprogram/"
-      }
-    ],
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
+    "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+    "packOptions": {
+        "ignore": [],
+        "include": []
     },
-    "enableEngineNative": false,
-    "bundle": false,
-    "useIsolateContext": true,
-    "useCompilerModule": false,
-    "userConfirmedUseCompilerModuleSwitch": false,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "minifyWXSS": true,
-    "lazyloadPlaceholderEnable": false,
-    "useStaticServer": true,
-    "showES6CompileOption": false,
-    "disableUseStrict": false,
-    "useCompilerPlugins": false,
-    "minifyWXML": true,
-    "condition": false,
-    "ignoreUploadUnusedFiles": true
-  },
-  "compileType": "miniprogram",
-  "libVersion": "3.8.9",
-  "appid": "wx4bb7b6050831f585",
-  "projectname": "%E8%8B%8F%E5%B7%9E%E6%96%87%E6%97%85",
-  "simulatorType": "wechat",
-  "simulatorPluginLibVersion": {},
-  "condition": {
-    "miniprogram": {
-      "list": [
-        {
-          "name": "pages/user/bindtel/index",
-          "pathName": "pages/user/bindtel/index",
-          "query": "id=0000000000LINELINEINFO18082257199008",
-          "scene": null
+    "setting": {
+        "urlCheck": false,
+        "es6": true,
+        "enhance": true,
+        "postcss": true,
+        "preloadBackgroundData": false,
+        "minified": true,
+        "newFeature": true,
+        "coverView": true,
+        "nodeModules": false,
+        "autoAudits": false,
+        "showShadowRootInWxmlPanel": true,
+        "packNpmRelationList": [
+            {
+                "packageJsonPath": "./package.json",
+                "miniprogramNpmDistDir": "./miniprogram/"
+            }
+        ],
+        "scopeDataCheck": false,
+        "uglifyFileName": false,
+        "checkInvalidKey": true,
+        "checkSiteMap": true,
+        "uploadWithSourceMap": true,
+        "compileHotReLoad": false,
+        "useMultiFrameRuntime": true,
+        "useApiHook": true,
+        "useApiHostProcess": true,
+        "babelSetting": {
+            "ignore": [],
+            "disablePlugins": [],
+            "outputPath": ""
         },
-        {
-          "name": "好行",
-          "pathName": "pages/list/haoxing/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "pages/list/activitynew/index",
-          "pathName": "pages/list/activitynew/index",
-          "query": "id=0000000000LINELINEINFO18082257199008",
-          "scene": null
-        },
-        {
-          "name": "微旅行",
-          "pathName": "pages/list/minitrip/index",
-          "query": "",
-          "scene": null
-        },
-        {
-          "name": "一日游",
-          "pathName": "pages/list/oneday/index",
-          "query": "",
-          "scene": null
+        "enableEngineNative": false,
+        "bundle": false,
+        "useIsolateContext": true,
+        "useCompilerModule": false,
+        "userConfirmedUseCompilerModuleSwitch": false,
+        "userConfirmedBundleSwitch": false,
+        "packNpmManually": false,
+        "minifyWXSS": true,
+        "lazyloadPlaceholderEnable": false,
+        "useStaticServer": true,
+        "showES6CompileOption": false,
+        "disableUseStrict": false,
+        "useCompilerPlugins": false,
+        "minifyWXML": true,
+        "condition": false,
+        "ignoreUploadUnusedFiles": true
+    },
+    "compileType": "miniprogram",
+    "libVersion": "3.8.9",
+    "appid": "wx4bb7b6050831f585",
+    "projectname": "%E8%8B%8F%E5%B7%9E%E6%96%87%E6%97%85",
+    "simulatorType": "wechat",
+    "simulatorPluginLibVersion": {},
+    "condition": {
+        "miniprogram": {
+            "list": [
+                {
+                    "name": "pages/user/bindtel/index",
+                    "pathName": "pages/user/bindtel/index",
+                    "query": "id=0000000000LINELINEINFO18082257199008",
+                    "scene": null
+                },
+                {
+                    "name": "好行",
+                    "pathName": "pages/list/haoxing/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "pages/list/activitynew/index",
+                    "pathName": "pages/list/activitynew/index",
+                    "query": "id=0000000000LINELINEINFO18082257199008",
+                    "scene": null
+                },
+                {
+                    "name": "微旅行",
+                    "pathName": "pages/list/minitrip/index",
+                    "query": "",
+                    "scene": null
+                },
+                {
+                    "name": "一日游",
+                    "pathName": "pages/list/oneday/index",
+                    "query": "",
+                    "scene": null
+                }
+            ]
         }
-      ]
+    },
+    "editorSetting": {
+        "tabIndent": "insertSpaces",
+        "tabSize": 2
     }
-  },
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
-  }
 }

project.private.config.json

@@ -6,12 +6,19 @@
   "condition": {
     "miniprogram": {
       "list": [
+        {
+          "name": "pages/info/roadInfo/index",
+          "pathName": "pages/info/roadInfo/index",
+          "query": "id=465058",
+          "scene": null,
+          "launchMode": "default"
+        },
         {
           "name": "pages/pbService/web/index",
           "pathName": "pages/pbService/web/index",
           "query": "weburl=https://test.m.cloud.sz-trip.com/selectedHotels",
-          "scene": null,
-          "launchMode": "default"
+          "launchMode": "default",
+          "scene": null
         },
         {
           "name": "pages/group/index",

subPackages/feiyiNew/index.js

@@ -623,6 +623,7 @@ Page({
         this.setData({
             info: res.data,
             // skuFlag: "cart"
+            user_type: res.data.sku[0].use_type>1?null:res.data.sku[0].use_type,
         })
         this.showCart()
         this.BroswerRecord()
@@ -667,7 +668,7 @@ Page({
       let index = e.currentTarget.dataset.index;
       this.setData({
         skuIndex: index,
-        user_type: null,
+        user_type: this.data.info.sku[index].use_type>1?null:this.data.info.sku[index].use_type,
     })
   },
   changeSelectSkuPost: function(e) {

subPackages/password/overview/overview.wxml

@@ -14,7 +14,7 @@
   <view class="iconfont icon-you"></view>
 </view>
 <view bindtap="goSetting" data-type="reset" class="profile-item" wx:if="{{havePassword&&!isLock}}">
-  <text>忘记密码</text>
+  <text>重置密码</text>
   <view class="info"></view>
   <view class="iconfont icon-you"></view>
 </view>

subPackages/password/setting/setting.js

@@ -41,7 +41,7 @@ Page({
   onLoad: function (options) {
     this.setData({
         type: options.type||'add',
-        title: options.type=='reset'?'忘记密码':options.type=='edit'?'修改密码':'设置支付密码',
+        title: options.type=='reset'?'重置密码':options.type=='edit'?'修改密码':'设置支付密码',
         editConfrim: options.type == 'edit'?true:false
     })
   },

subPackages/postSearch/index.js

@@ -487,9 +487,6 @@ openPopup() {
   },
   // 添加产品弹窗 1.首先获取到该产品下的规格
   addBuyCart(e) {
-    this.setData({
-        user_type: null
-    })
     let item = e.currentTarget.dataset.item
     console.log(item);
     commonApi._post("product/get_product_detail", {
@@ -503,6 +500,8 @@ openPopup() {
         this.setData({
             info: res.data,
             // skuFlag: "cart"
+            skuIndex: 0,
+            user_type: res.data.sku[0].use_type>1?1:res.data.sku[0].use_type
         })
         this.showCart()
         this.BroswerRecord()
@@ -547,7 +546,7 @@ openPopup() {
       let index = e.currentTarget.dataset.index;
       this.setData({
           skuIndex: index,
-          user_type: null,
+          user_type: this.data.info.sku[index].use_type>1?null:this.data.info.sku[index].use_type,
       })
   },
   changeSelectSkuPost: function(e) {

subPackages/techanNew/index.js

@@ -630,9 +630,6 @@ Page({
   },
   // 添加产品弹窗 1.首先获取到该产品下的规格
   addBuyCart(e) {
-    this.setData({
-        user_type: null
-    })
 
     let item = e.currentTarget.dataset.item
     console.log(item);
@@ -646,6 +643,8 @@ Page({
         res.data.flag = res.data.sku.find(item => item.flag == 'on') ? res.data.flag : 0
         this.setData({
             info: res.data,
+            skuIndex: 0,
+            user_type: res.data.sku[0].use_type>1?null:res.data.sku[0].use_type
             // skuFlag: "cart"
         })
         this.showCart()
@@ -691,7 +690,7 @@ Page({
       let index = e.currentTarget.dataset.index;
       this.setData({
           skuIndex: index,
-          user_type: null,
+          user_type: this.data.info.sku[index].use_type>1?null:this.data.info.sku[index].use_type,
       })
   },