diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json
index a359a7b87..87fe7c8df 100755
--- a/public/appmini/old/weixin/app.json
+++ b/public/appmini/old/weixin/app.json
@@ -1,8 +1,8 @@
{
"pages": [
- "pages/plugins/distribution/extraction-order/extraction-order",
"pages/plugins/distribution/extraction/extraction",
"pages/plugins/distribution/extraction-apply/extraction-apply",
+ "pages/plugins/distribution/extraction-order/extraction-order",
"pages/plugins/distribution/user/user",
"pages/index/index",
"pages/goods-category/goods-category",
diff --git a/public/appmini/old/weixin/pages/plugins/distribution/extraction-apply/extraction-apply.js b/public/appmini/old/weixin/pages/plugins/distribution/extraction-apply/extraction-apply.js
index d6437a37b..b956f2a2b 100644
--- a/public/appmini/old/weixin/pages/plugins/distribution/extraction-apply/extraction-apply.js
+++ b/public/appmini/old/weixin/pages/plugins/distribution/extraction-apply/extraction-apply.js
@@ -10,9 +10,6 @@ Page({
city_id: null,
county_id: null,
- lng: 0,
- lat: 0,
-
default_province: "请选择省",
default_city: "请选择市",
default_county: "请选择区/县",
@@ -338,36 +335,57 @@ Page({
// 验证提交表单
if (app.fields_check(form_data, validation)) {
- self.setData({ form_submit_disabled_status: true});
- wx.showLoading({ title: "处理中..." });
- wx.request({
- url: app.get_request_url("applysave", "extraction", "distribution"),
- method: "POST",
- data: form_data,
- dataType: "json",
- header: { 'content-type': 'application/x-www-form-urlencoded' },
- success: res => {
- self.setData({ form_submit_disabled_status: false });
- wx.hideLoading();
- if (res.data.code == 0) {
- app.showToast(res.data.msg, "success");
- setTimeout(function () {
- wx.navigateBack();
- }, 1000);
- } else {
- if (app.is_login_check(res.data)) {
- app.showToast(res.data.msg);
- } else {
- app.showToast('提交失败，请重试！');
+ if ((self.data.extraction_data || null) != null && (self.data.extraction_data.status || 0) == 1)
+ {
+ wx.showModal({
+ title: '温馨提示',
+ content: '数据需重新审核后方可生效',
+ confirmText: '确认',
+ cancelText: '暂不',
+ success: (result) => {
+ if (result.confirm) {
+ self.request_data_save(form_data);
}
- }
- },
- fail: () => {
- self.setData({ form_submit_disabled_status: false });
- wx.hideLoading();
- app.showToast("服务器请求出错");
- }
- });
+ },
+ });
+ } else {
+ self.request_data_save(form_data);
+ }
}
},
+
+ // 数据保存
+ request_data_save(data) {
+ var self = this;
+ self.setData({ form_submit_disabled_status: true });
+ wx.showLoading({ title: "处理中..." });
+ wx.request({
+ url: app.get_request_url("applysave", "extraction", "distribution"),
+ method: "POST",
+ data: data,
+ dataType: "json",
+ header: { 'content-type': 'application/x-www-form-urlencoded' },
+ success: res => {
+ self.setData({ form_submit_disabled_status: false });
+ wx.hideLoading();
+ if (res.data.code == 0) {
+ app.showToast(res.data.msg, "success");
+ setTimeout(function () {
+ wx.navigateBack();
+ }, 1000);
+ } else {
+ if (app.is_login_check(res.data)) {
+ app.showToast(res.data.msg);
+ } else {
+ app.showToast('提交失败，请重试！');
+ }
+ }
+ },
+ fail: () => {
+ self.setData({ form_submit_disabled_status: false });
+ wx.hideLoading();
+ app.showToast("服务器请求出错");
+ }
+ });
+ },
});
diff --git a/public/appmini/old/weixin/pages/plugins/distribution/extraction-apply/extraction-apply.json b/public/appmini/old/weixin/pages/plugins/distribution/extraction-apply/extraction-apply.json
index 30fe7215d..ff0eabd5c 100644
--- a/public/appmini/old/weixin/pages/plugins/distribution/extraction-apply/extraction-apply.json
+++ b/public/appmini/old/weixin/pages/plugins/distribution/extraction-apply/extraction-apply.json
@@ -4,5 +4,5 @@
"backgroundColorTop": "#ff6a80",
"backgroundColorBottom": "#f5f5f5",
"backgroundTextStyle": "light",
- "navigationBarTitleText": "取货点申请"
+ "navigationBarTitleText": "取货点信息"
}
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/plugins/distribution/extraction-apply/extraction-apply.wxml b/public/appmini/old/weixin/pages/plugins/distribution/extraction-apply/extraction-apply.wxml
index 8993c5816..bb79029e7 100644
--- a/public/appmini/old/weixin/pages/plugins/distribution/extraction-apply/extraction-apply.wxml
+++ b/public/appmini/old/weixin/pages/plugins/distribution/extraction-apply/extraction-apply.wxml
@@ -1,4 +1,4 @@
-
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.js b/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.js
index c5dc44e19..7b6b61848 100644
--- a/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.js
+++ b/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.js
@@ -10,15 +10,20 @@ Page({
nav_status_list: [
{ name: "全部", value: "-1" },
- { name: "待取货", value: "0" },
- { name: "已取货", value: "1" }
+ { name: "待处理", value: "0" },
+ { name: "已处理", value: "1" }
],
- nav_status_index: -1,
+ nav_status_index: 0,
+
+ is_show_take_popup: false,
+ extraction_value: null,
+ extraction_code: '',
+ form_submit_disabled_status: false,
},
onLoad(params) {
// 是否指定状态
- var nav_status_index = -1;
+ var nav_status_index = 0;
if (params.status != undefined) {
for (var i in this.data.nav_status_list) {
if (this.data.nav_status_list[i]['value'] == params.status) {
@@ -163,4 +168,78 @@ Page({
});
this.get_data_list(1);
},
+
+ // 取件码弹层-开启
+ list_submit_take_event(e) {
+ this.setData({
+ is_show_take_popup: true,
+ extraction_code: '',
+ extraction_value: {
+ index: e.currentTarget.dataset.index,
+ oid: e.currentTarget.dataset.oid,
+ uid: e.currentTarget.dataset.uid
+ },
+ });
+ },
+
+ // 取件码弹层-关闭
+ take_popup_event_close() {
+ this.setData({ is_show_take_popup: false });
+ },
+
+ // 取件码输入事件
+ extraction_code_input_event(e) {
+ this.setData({ extraction_code: e.detail.value || ''});
+ },
+
+ // 取件提交
+ form_submit_take_event(e) {
+ var self = this;
+ // 参数
+ if ((self.data.extraction_code || null) == null)
+ {
+ app.showToast('请输入取件码');
+ return false;
+ }
+ if ((self.data.extraction_value || null) == null) {
+ app.showToast('操作数据有误');
+ return false;
+ }
+
+ // 提交表单
+ var data = {
+ id: self.data.extraction_value.oid,
+ user_id: self.data.extraction_value.uid,
+ extraction_code: self.data.extraction_code,
+ };
+ self.setData({ form_submit_disabled_status: true });
+ wx.request({
+ url: app.get_request_url("take", "extraction", "distribution"),
+ method: "POST",
+ data: data,
+ dataType: "json",
+ success: res => {
+ self.setData({ form_submit_disabled_status: false });
+ wx.hideLoading();
+ if (res.data.code == 0) {
+ var temp_data_list = this.data.data_list;
+ var index = self.data.extraction_value.index;
+ temp_data_list[index]['status'] = 1;
+ temp_data_list[index]['status_name'] = '已处理';
+ self.setData({
+ is_show_take_popup: false,
+ data_list: temp_data_list,
+ });
+ app.showToast(res.data.msg, "success");
+ } else {
+ app.showToast(res.data.msg);
+ }
+ },
+ fail: () => {
+ self.setData({ form_submit_disabled_status: false });
+ wx.hideLoading();
+ app.showToast("服务器请求出错");
+ }
+ });
+ },
});
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.json b/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.json
index 041886a02..fc1921bef 100644
--- a/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.json
+++ b/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.json
@@ -4,5 +4,8 @@
"backgroundColorTop": "#ff6a80",
"backgroundColorBottom": "#f5f5f5",
"backgroundTextStyle": "light",
- "navigationBarTitleText": "取货订单"
+ "navigationBarTitleText": "取货订单",
+ "usingComponents": {
+ "component-popup": "/components/popup/popup"
+ }
}
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxml b/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxml
index 84a6e7784..53e9ff664 100644
--- a/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxml
+++ b/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxml
@@ -11,7 +11,7 @@
{{item.add_time}}
- {{item.order_status_name}}
+ {{item.status_name}}
@@ -25,8 +25,8 @@
-
-
+
+
@@ -39,4 +39,17 @@
-
\ No newline at end of file
+
+
+
+
+
+
+ 取货码
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxss b/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxss
index 37d8d048b..2a3d9fdd1 100644
--- a/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxss
+++ b/public/appmini/old/weixin/pages/plugins/distribution/extraction-order/extraction-order.wxss
@@ -54,4 +54,12 @@
}
.data-list .item .operation button:not(:first-child) {
margin-left: 30rpx;
+}
+
+/*
+ * 表单
+ */
+.submit-bottom {
+ background-color: #ff6a80 !important;
+ color: #fff !important;
}
\ No newline at end of file
diff --git a/public/appmini/old/weixin/pages/plugins/distribution/extraction/extraction.js b/public/appmini/old/weixin/pages/plugins/distribution/extraction/extraction.js
index 90d82118c..ba453d1c4 100644
--- a/public/appmini/old/weixin/pages/plugins/distribution/extraction/extraction.js
+++ b/public/appmini/old/weixin/pages/plugins/distribution/extraction/extraction.js
@@ -6,6 +6,7 @@ Page({
data_list_loding_msg: '',
data_base: null,
extraction: null,
+ statistical: null,
},
onLoad(params) {},
@@ -51,6 +52,7 @@ Page({
self.setData({
data_base: data.base || null,
extraction: data.extraction || null,
+ statistical: data.statistical || null,
data_list_loding_msg: '',
data_list_loding_status: 0,
data_bottom_line_status: true,
@@ -87,7 +89,6 @@ Page({
// 地图查看
address_map_event(e) {
if ((this.data.extraction || null) == null) {
- app.showToast("地址有误");
return false;
}
@@ -95,7 +96,6 @@ Page({
var lng = parseFloat(ads.lng || 0);
var lat = parseFloat(ads.lat || 0);
if (lng <= 0 || lat <= 0) {
- app.showToast("坐标有误");
return false;
}
diff --git a/public/appmini/old/weixin/pages/plugins/distribution/extraction/extraction.wxml b/public/appmini/old/weixin/pages/plugins/distribution/extraction/extraction.wxml
index ba2286e92..a1a060283 100644
--- a/public/appmini/old/weixin/pages/plugins/distribution/extraction/extraction.wxml
+++ b/public/appmini/old/weixin/pages/plugins/distribution/extraction/extraction.wxml
@@ -32,31 +32,43 @@
-
+
取货点信息
- 查看位置
+
+ 编辑信息
+
-
+
{{extraction.alias}}
{{extraction.province_name}}{{extraction.city_name}}{{extraction.county_name}}{{extraction.address}}
-
- 取货订单统计
-
-
-
- 待处理
- 4544543564634534635635
+
+
+ 取货订单统计
+
+ 查看取货订单
+
-
- 已处理
- 67769865787657635325454546
+
+
+ 待处理
+ {{statistical.order_wait || 0}}
+
+
+ 已处理
+ {{statistical.order_already || 0}}
+
+
+
+
+
+ 当前状态也解约，可重新编辑数据提交审核。
-