diff --git a/app.js b/app.js index ec3e5c3..b262d8d 100644 --- a/app.js +++ b/app.js @@ -1,6 +1,6 @@ //app.js App({ - evn: 1, // 0: 开发版本;1:测试版本;2:生产版本 + evn: 2, // 0: 开发版本;1:测试版本;2:生产版本 tmplIds: [''], version: 152, xAppId: '503258978847953926', diff --git a/pages/home/customer-info/index.js b/pages/home/customer-info/index.js index 94b756f..bb3ccba 100644 --- a/pages/home/customer-info/index.js +++ b/pages/home/customer-info/index.js @@ -1,8 +1,6 @@ // pages/home/customer-info/index.js -import { generateCode } from "../../../api/user" import { getCustomerInfo } from "../../../api/saas" const util = require('../../../utils/util') -const app = getApp() Page({ /** @@ -33,21 +31,6 @@ Page({ this.setData({ showEmbedded: false }) }, registCustomer: function(){ - wx.showLoading({ title: '加载中', mask: true }) - const params = { id: 6 } - params.metaData = { - factoryId: app.userInfo.factoryId, - factoryName: app.userInfo.factoryName, - factoryCustomerId: this.data.form.id, - factoryCustomerName: this.data.form.name, - factoryCustomerMobile: this.data.form.mobile - } - generateCode(params).then(result => { - this.setData({ showEmbedded: true, base64: result.data, customerName: this.data.form.name }) - wx.hideLoading() - }).catch(err => { - wx.hideLoading() - util.showToast(err) - }) + wx.navigateTo({ url: `/pages/client/registe/index?id=${this.data.form.id}` }) } }) \ No newline at end of file diff --git a/pages/home/customer-list/index.js b/pages/home/customer-list/index.js index f53092c..13d8a91 100644 --- a/pages/home/customer-list/index.js +++ b/pages/home/customer-list/index.js @@ -1,5 +1,4 @@ // pages/home/customer/index.js -import { generateCode } from "../../../api/user" import { getCustomerList } from "../../../api/saas" const util = require('../../../utils/util') const app = getApp() @@ -95,22 +94,5 @@ Page({ bindCustomer: function(e){ var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index] wx.navigateTo({ url: `/pages/client/registe/index?id=${item.id}` }) - - // wx.showLoading({ title: '加载中', mask: true }) - // const form = { id: 6 } - // form.metaData = { - // factoryId: app.userInfo.factoryId, - // factoryName: app.userInfo.factoryName, - // factoryCustomerId: item.id, - // factoryCustomerName: item.name, - // factoryCustomerMobile: item.mobile - // } - // generateCode(form).then(result => { - // this.setData({ showEmbedded: true, base64: result.data, customerName: item.name }) - // wx.hideLoading() - // }).catch(err => { - // wx.hideLoading() - // util.showToast(err) - // }) } }) \ No newline at end of file diff --git a/pages/process/payment/index.wxml b/pages/process/payment/index.wxml index 04861b0..836f734 100644 --- a/pages/process/payment/index.wxml +++ b/pages/process/payment/index.wxml @@ -61,8 +61,9 @@ {{item.bangTime}} - 废纸品类:{{item.productName}} - 金额:{{formate.formateAmount(item.settlePrice)}}元 + 品类:{{item.productName}} + 重量:{{item.settleWeight}}公斤 + 金额:{{formate.formateAmount(item.settlePrice)}}元