Browse Source

合并票

master
jiazhipeng 9 months ago
parent
commit
085865a69b
  1. 14
      pages/order/scene/index.js
  2. 7
      project.private.config.json
  3. 4
      utils/https.js

14
pages/order/scene/index.js

@ -104,6 +104,15 @@ Page({
this.couponCom = this.selectAllComponents("#coupon")[0]; this.couponCom = this.selectAllComponents("#coupon")[0];
} }
}, },
initPage () {
this.setData({
is_need_idcard:app.globalData.product.sku.sku_model.is_need_idcard,
is_authentication:app.globalData.product.sku.sku_model.is_authentication,
is_real_name:app.globalData.product.sku.sku_model.is_real_name,
})
},
// next: function () { // next: function () {
// this.setData({ // this.setData({
// showMask:true // showMask:true
@ -414,11 +423,14 @@ Page({
}, },
changed() { changed() {
console.log('time---',this.data.date,this.data.time) console.log('time---',this.data.date,this.data.time)
app.globalData.product.date = this.data.date app.globalData.product.date = this.data.date
app.globalData.product.time = this.data.time app.globalData.product.time = this.data.time
app.globalData.product.changeFlag = true app.globalData.product.changeFlag = true
this.hideDate() this.hideDate()
// this.initPage()
}, },
order:function() { order:function() {
let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product; let linkmanList = this.data.linkmanList, productNum = this.data.productNum, date = this.data.date, time = this.data.time, remark = this.data.remark, product = this.data.product;

7
project.private.config.json

@ -6,6 +6,13 @@
"condition": { "condition": {
"miniprogram": { "miniprogram": {
"list": [ "list": [
{
"name": "pages/info/sceneProductInfo/index",
"pathName": "pages/info/sceneProductInfo/index",
"query": "id=54182",
"launchMode": "default",
"scene": null
},
{ {
"name": "pages/pbService/web/index", "name": "pages/pbService/web/index",
"pathName": "pages/pbService/web/index", "pathName": "pages/pbService/web/index",

4
utils/https.js

@ -1,8 +1,8 @@
var app = getApp(); var app = getApp();
import util from "../utils/util" import util from "../utils/util"
// import userApi from "../utils/https/user.js"; // import userApi from "../utils/https/user.js";
// const baseUrl = "https://test.api.cloud.sz-trip.com/api/"; const baseUrl = "https://test.api.cloud.sz-trip.com/api/";
let baseUrl = "https://api.cloud.sz-trip.com/api/"; // let baseUrl = "https://api.cloud.sz-trip.com/api/";
const env = wx.getAccountInfoSync().miniProgram.envVersion const env = wx.getAccountInfoSync().miniProgram.envVersion
if (env == 'develop1') { if (env == 'develop1') {
baseUrl = "https://test.api.cloud.sz-trip.com/api/" baseUrl = "https://test.api.cloud.sz-trip.com/api/"

Loading…
Cancel
Save