diff --git a/app.js b/app.js
index 105394b..50ac6e8 100644
--- a/app.js
+++ b/app.js
@@ -1,11 +1,10 @@
//app.js
App({
- evn: 0, // 0: 开发版本;1:测试版本;2:生产版本
+ evn: 2, // 0: 开发版本;1:测试版本;2:生产版本
tmplIds: [''],
version: 152,
xAppId: '503258978847953926',
userInfo: null,
-
//----------------------------------------------globalData--------------------------------------
globalData: {
token: null,
diff --git a/pages/home/customer-info/index.js b/pages/home/customer-info/index.js
index 08519ad..ee95f2a 100644
--- a/pages/home/customer-info/index.js
+++ b/pages/home/customer-info/index.js
@@ -29,6 +29,9 @@ Scene({
wx.showLoading({ title: '正在获取', mask: true })
getCustomerInfo(options.id).then(result => {
wx.hideLoading()
+ if(!util.isEmpty(options.userId)){
+ result.data.userId = options.userId
+ }
this.setData({ form: result.data })
}).catch(err => {
wx.hideLoading()
diff --git a/pages/home/customer-info/index.wxml b/pages/home/customer-info/index.wxml
index b1bd176..bdc6d81 100644
--- a/pages/home/customer-info/index.wxml
+++ b/pages/home/customer-info/index.wxml
@@ -7,7 +7,7 @@
-
+
diff --git a/pages/home/customer-list/index.js b/pages/home/customer-list/index.js
index a1627ec..1462a0a 100644
--- a/pages/home/customer-list/index.js
+++ b/pages/home/customer-list/index.js
@@ -83,7 +83,11 @@ Scene({
this.data.page = e.currentTarget.dataset.page
this.data.index = e.currentTarget.dataset.index
var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
- wx.navigateTo({ url: `/pages/home/customer-info/index?id=${item.id}` })
+ if(util.isEmpty(item.userId)){
+ wx.navigateTo({ url: `/pages/home/customer-info/index?id=${item.id}` })
+ } else {
+ wx.navigateTo({ url: `/pages/home/customer-info/index?id=${item.id}&userId=${item.userId}` })
+ }
},
bindCustomer: function(e){
var item = this.data.orderList[e.currentTarget.dataset.page][e.currentTarget.dataset.index]
diff --git a/pages/home/employee-info/index.json b/pages/home/employee-info/index.json
index 4874e67..034d091 100644
--- a/pages/home/employee-info/index.json
+++ b/pages/home/employee-info/index.json
@@ -4,7 +4,6 @@
"van-cell": "/components/cell/index",
"van-field": "/components/field/index",
"van-loading": "/components/loading/index",
- "van-image": "/components/image/index",
"van-icon": "/components/icon/index",
"van-notice-bar": "/components/notice-bar/index",
"van-checker": "/components/checker/index",
diff --git a/pages/home/employee-info/index.wxml b/pages/home/employee-info/index.wxml
index d238489..11d3040 100644
--- a/pages/home/employee-info/index.wxml
+++ b/pages/home/employee-info/index.wxml
@@ -6,7 +6,7 @@
-
+
员工状态:
diff --git a/pages/setting/paper-detial/index.wxml b/pages/setting/paper-detial/index.wxml
index eea647b..1c8a19a 100644
--- a/pages/setting/paper-detial/index.wxml
+++ b/pages/setting/paper-detial/index.wxml
@@ -5,7 +5,7 @@
+ bindtap="chooseMethod" placeholder="请选择品类"/>
- 删除
-
+ 删除
+
保存
diff --git a/pages/setting/paper/index.js b/pages/setting/paper/index.js
index 0c8104c..f4b40c6 100644
--- a/pages/setting/paper/index.js
+++ b/pages/setting/paper/index.js
@@ -28,7 +28,6 @@ Scene({
this.fetchOrderList()
},
onEvent: function(message){
- console.log('onEvent....31')
if (message.what == 201) {
this.onRefreshList()
} else if (message.what == 202) {