diff --git a/locale/en.json b/locale/en.json
index 54da30fa..1641ca10 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -15,6 +15,8 @@
"add": "Add",
"del": "Delete",
"edit": "Edit",
+ "link": "Link",
+ "gift": "Gift",
"more": "More",
"more_null": "",
"search": "Search",
@@ -30,6 +32,8 @@
"return": "Return",
"view_text": "Check",
"detail_text": "Detail",
+ "yes_text": "Yes",
+ "no_text": "NO",
"place_order_text": "Place Order",
"processing_in_text": "Processing",
"loading_in_text": "Loading",
diff --git a/locale/zh.json b/locale/zh.json
index 530c12bc..189c86fb 100644
--- a/locale/zh.json
+++ b/locale/zh.json
@@ -15,6 +15,8 @@
"add": "新增",
"del": "删除",
"edit": "编辑",
+ "link": "链接",
+ "gift": "礼物",
"more": "更多",
"more_null": "更 多",
"search": "搜索",
@@ -30,6 +32,8 @@
"return": "返回",
"view_text": "查看",
"detail_text": "详情",
+ "yes_text": "是",
+ "no_text": "否",
"place_order_text": "下单",
"processing_in_text": "处理中...",
"loading_in_text": "加载中...",
diff --git a/pages.json b/pages.json
index 422c09d9..94bdb3f0 100644
--- a/pages.json
+++ b/pages.json
@@ -1601,13 +1601,6 @@
"navigationBarTitleText": ""
}
},
- {
- "path": "receive/receive",
- "style": {
- "enablePullDownRefresh": true,
- "navigationBarTitleText": ""
- }
- },
{
"path": "gift/gift",
"style": {
@@ -1621,6 +1614,20 @@
"enablePullDownRefresh": true,
"navigationBarTitleText": ""
}
+ },
+ {
+ "path": "code/code",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
+ },
+ {
+ "path": "receive/receive",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": ""
+ }
}
]
},
diff --git a/pages/plugins/distribution/extraction-order/extraction-order.vue b/pages/plugins/distribution/extraction-order/extraction-order.vue
index 350536d4..ff971397 100644
--- a/pages/plugins/distribution/extraction-order/extraction-order.vue
+++ b/pages/plugins/distribution/extraction-order/extraction-order.vue
@@ -3,7 +3,7 @@
- {{ item.name }}
+ {{ item.name }}
diff --git a/pages/plugins/distribution/order/order.vue b/pages/plugins/distribution/order/order.vue
index 498667b3..f426a5bd 100644
--- a/pages/plugins/distribution/order/order.vue
+++ b/pages/plugins/distribution/order/order.vue
@@ -3,7 +3,7 @@
- {{ item.name }}
+ {{ item.name }}
diff --git a/pages/plugins/distribution/profit/profit.vue b/pages/plugins/distribution/profit/profit.vue
index f8cd662f..b9054d38 100644
--- a/pages/plugins/distribution/profit/profit.vue
+++ b/pages/plugins/distribution/profit/profit.vue
@@ -3,7 +3,7 @@
- {{ item.name }}
+ {{ item.name }}
diff --git a/pages/plugins/excellentbuyreturntocash/profit/profit.vue b/pages/plugins/excellentbuyreturntocash/profit/profit.vue
index 0eb062ee..97acf9ad 100644
--- a/pages/plugins/excellentbuyreturntocash/profit/profit.vue
+++ b/pages/plugins/excellentbuyreturntocash/profit/profit.vue
@@ -3,7 +3,7 @@
- {{ item.name }}
+ {{ item.name }}
diff --git a/pages/plugins/givegift/code/code.vue b/pages/plugins/givegift/code/code.vue
new file mode 100644
index 00000000..02409e35
--- /dev/null
+++ b/pages/plugins/givegift/code/code.vue
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/plugins/givegift/gift/gift.css b/pages/plugins/givegift/gift/gift.css
index 61485416..fcf737c5 100644
--- a/pages/plugins/givegift/gift/gift.css
+++ b/pages/plugins/givegift/gift/gift.css
@@ -1,10 +1,3 @@
-/*
-* 导航
-*/
-.nav-base .item {
- width: 20%;
-}
-
/**
* 商品
*/
@@ -14,4 +7,11 @@
}
.goods-title {
width: calc(100% - 90rpx);
+}
+
+/**
+ * 编辑表单
+ */
+.form-container .message-tips {
+ width: calc(100% - 200rpx) !important;
}
\ No newline at end of file
diff --git a/pages/plugins/givegift/gift/gift.vue b/pages/plugins/givegift/gift/gift.vue
index 4b114e20..0b0d80e4 100644
--- a/pages/plugins/givegift/gift/gift.vue
+++ b/pages/plugins/givegift/gift/gift.vue
@@ -1,9 +1,9 @@
-
+
- {{ item.name }}
+ {{ item.name }}
@@ -26,6 +26,10 @@
+
+
+
+
@@ -49,7 +53,25 @@
- {{edit_data.order_no}}
+
@@ -98,7 +120,9 @@
data_is_loading: 0,
params: null,
edit_data: null,
- popup_edit_status: false,
+ popup_edit_status: false,
+ edit_item_index: 0,
+ form_submit_disabled_status: false,
// 支付弹窗参数
pay_url: '',
qrcode_url: '',
@@ -496,8 +520,11 @@
var index = e.currentTarget.dataset.index || 0;
this.setData({
popup_edit_status: true,
- edit_data: this.data_list[index]
+ edit_data: this.data_list[index],
+ edit_item_index: index
});
+
+ console.log(this.edit_data)
},
// 编辑弹层关闭
@@ -505,6 +532,57 @@
this.setData({
popup_edit_status: false,
});
+ },
+
+ // 数据提交
+ form_submit(e) {
+ var form_data = e.detail.value;
+ form_data['is_no_limit_receive'] = form_data.is_no_limit_receive == true ? 1 : 0;
+ form_data['id'] = this.edit_data.id;
+ this.setData({
+ form_submit_disabled_status: true,
+ });
+ uni.showLoading({
+ title: this.$t('common.processing_in_text'),
+ });
+ uni.request({
+ url: app.globalData.get_request_url('save', 'gift', 'givegift'),
+ method: 'POST',
+ data: form_data,
+ dataType: 'json',
+ success: (res) => {
+ uni.hideLoading();
+ if (res.data.code == 0) {
+ var temp_data = this.data_list;
+ var index = this.edit_item_index;
+ temp_data[index]['is_no_limit_receive_name'] = form_data.is_no_limit_receive == 1 ? this.$t('common.yes_text') : this.$t('common.no_text');
+ temp_data[index]['is_no_limit_receive'] = form_data.is_no_limit_receive;
+ temp_data[index]['message_tips'] = form_data.message_tips;
+ this.setData({
+ data_list: temp_data,
+ form_submit_disabled_status: false,
+ popup_edit_status: false
+ });
+ app.globalData.showToast(res.data.msg, 'success');
+ } else {
+ this.setData({
+ form_submit_disabled_status: false,
+ });
+ if (app.globalData.is_login_check(res.data, this, 'form_submit', e)) {
+ app.globalData.showToast(res.data.msg);
+ } else {
+ app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
+ }
+ }
+ },
+ fail: () => {
+ this.setData({
+ form_submit_disabled_status: false,
+ });
+ uni.hideLoading();
+ app.globalData.showToast(this.$t('common.internet_error_tips'));
+ },
+ });
},
// url事件
diff --git a/pages/plugins/givegift/goods/goods.vue b/pages/plugins/givegift/goods/goods.vue
index b77cd52b..30b3a9b8 100644
--- a/pages/plugins/givegift/goods/goods.vue
+++ b/pages/plugins/givegift/goods/goods.vue
@@ -278,7 +278,7 @@
this.setData({
form_submit_disabled_status: false,
});
- if (app.globalData.is_login_check(res.data)) {
+ if (app.globalData.is_login_check(res.data, this, 'form_submit', e)) {
app.globalData.showToast(res.data.msg);
} else {
app.globalData.showToast(this.$t('common.sub_error_retry_tips'));
diff --git a/pages/plugins/invoice/invoice/invoice.vue b/pages/plugins/invoice/invoice/invoice.vue
index 83a3b2bf..8753b838 100644
--- a/pages/plugins/invoice/invoice/invoice.vue
+++ b/pages/plugins/invoice/invoice/invoice.vue
@@ -7,7 +7,7 @@
- {{ item.name }}
+ {{ item.name }}
diff --git a/pages/plugins/membershiplevelvip/order/order.vue b/pages/plugins/membershiplevelvip/order/order.vue
index d51f5ca9..301ced9a 100644
--- a/pages/plugins/membershiplevelvip/order/order.vue
+++ b/pages/plugins/membershiplevelvip/order/order.vue
@@ -3,7 +3,7 @@
- {{ item.name }}
+ {{ item.name }}
diff --git a/pages/plugins/membershiplevelvip/profit/profit.vue b/pages/plugins/membershiplevelvip/profit/profit.vue
index 9d65d65a..fc3fc6f4 100644
--- a/pages/plugins/membershiplevelvip/profit/profit.vue
+++ b/pages/plugins/membershiplevelvip/profit/profit.vue
@@ -3,7 +3,7 @@
- {{ item.name }}
+ {{ item.name }}
diff --git a/pages/plugins/weixinliveplayer/search/search.vue b/pages/plugins/weixinliveplayer/search/search.vue
index 2b186f2b..105706c1 100644
--- a/pages/plugins/weixinliveplayer/search/search.vue
+++ b/pages/plugins/weixinliveplayer/search/search.vue
@@ -3,7 +3,7 @@
- {{ item.name }}
+ {{ item.name }}