bbnv1
/
test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

master
jiazhipeng 5 months ago
parent
5f863f88f4
commit
ed48ff7640
13 changed files with 125 additions and 117 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      app.js
  2. 5
      pages/info/postProductInfo/index.js
  3. 2
      pages/list/six/index.wxml
  4. 4
      pages/order/pay/index.js
  5. 2
      pages/order/pay/index.wxml
  6. 3
      pages/user/user.wxml
  7. 192
      project.config.json
  8. 11
      project.private.config.json
  9. 3
      subPackages/feiyiNew/index.js
  10. 2
      subPackages/password/overview/overview.wxml
  11. 2
      subPackages/password/setting/setting.js
  12. 7
      subPackages/postSearch/index.js
  13. 7
      subPackages/techanNew/index.js

2
app.js
View File

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

5
pages/info/postProductInfo/index.js
View File

@ -320,7 +320,8 @@ Page({
return; return;
} }
this.setData({ 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 let that = this
wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) { wx.createSelectorQuery().select('#skuImg').boundingClientRect(function (res) {
@ -354,7 +355,7 @@ Page({
this.setData({ this.setData({
skuIndex: index, skuIndex: index,
swiperCurrent: index+this.data.swiperRange.picture.max+1, 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,
}) })
}, },

2
pages/list/six/index.wxml
View File

@ -1,6 +1,6 @@
<!--pages/list/six/index.wxml--> <!--pages/list/six/index.wxml-->
<!-- <search bind:onload="search"></search> --> <!-- <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="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> <image lazy-load src="{{areas[areaIndex].img}}" mode="widthFix" class="bannerImg" data-event="{{areas[areaIndex]}}" bindtap="gotoPath"></image>

4
pages/order/pay/index.js
View File

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

2
pages/order/pay/index.wxml
View File

@ -137,7 +137,7 @@
</view> </view>
<view class="resetPassword"> <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>
</view> </view>

3
pages/user/user.wxml
View File

@ -66,9 +66,10 @@
<!-- <navigator url="order/team/list" class="user-box-line" catchtap="pagePoint" data-event="mine_teamorder"> <!-- <navigator url="order/team/list" class="user-box-line" catchtap="pagePoint" data-event="mine_teamorder">
团体预约订单 团体预约订单
</navigator> --> </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>
<!-- <navigator url="service/index" class="user-box-line" catchtap="pagePoint" data-event="mine_customerservice"> <!-- <navigator url="service/index" class="user-box-line" catchtap="pagePoint" data-event="mine_customerservice">
在线客服 在线客服
</navigator> --> </navigator> -->

192
project.config.json
View File

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

11
project.private.config.json
View File

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

3
subPackages/feiyiNew/index.js
View File

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

2
subPackages/password/overview/overview.wxml
View File

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

2
subPackages/password/setting/setting.js
View File

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

7
subPackages/postSearch/index.js
View File

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

7
subPackages/techanNew/index.js
View File

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

Write Preview
Loading…
Cancel
Save