diff --git a/changelog.md b/changelog.md
index d72742ba..731a123f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,19 @@
+## 6.2.0.3(2024-07-09)
+1. 多商户和门店新增核销
+
+
+
+## 6.2.0.2(2024-07-06)
+1. 礼品卡卡密数据展示优化
+2. 礼品卡新增扫码兑换
+
+
+
+## 6.2.0.1(2024-07-05)
+1. 修复安卓app下多语言切换无效问题
+
+
+
## v6.2.0(2024-07-04)
1. 新增礼品卡
2. 搜索需要登录优化
diff --git a/locale/en.json b/locale/en.json
index 83ca5b96..99175b46 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -55,7 +55,9 @@
"upd_time": "Update time",
"receive_time": "Receiving time",
"service_time": "service time ",
- "apply_time": "Application time"
+ "apply_time": "Application time",
+ "verification_text": "Verification code",
+ "verification_message": "Please enter the verification code"
},
"pages": {
"goods-category": "Product classification",
@@ -160,6 +162,7 @@
"plugins-shop-search": "Store Product Search",
"plugins-shop-favor": "Store favorites",
"plugins-shop-license": "Business qualifications",
+ "plugins-shop-check": "Order verification",
"plugins-activity-index": "All activities",
"plugins-activity-detail": "Event details",
"plugins-label-detail": "Label details",
@@ -179,6 +182,7 @@
"plugins-realstore-batchorder-list": "Batch orders",
"plugins-realstore-frequencycard-list": "Secondary card",
"plugins-realstore-frequencycard-used": "Secondary Card Usage Record",
+ "plugins-realstore-check": "Order verification",
"plugins-binding-index": "Combination and matching",
"plugins-binding-detail": "Combination and matching details",
"plugins-delivery-order": "Delivery order",
diff --git a/locale/zh.json b/locale/zh.json
index ab4d82c9..504c3a54 100644
--- a/locale/zh.json
+++ b/locale/zh.json
@@ -55,7 +55,9 @@
"upd_time": "更新时间",
"receive_time": "接收时间",
"service_time": "服务时间",
- "apply_time": "申请时间"
+ "apply_time": "申请时间",
+ "verification_text": "核销码",
+ "verification_message": "请输入核销码"
},
"pages": {
"goods-category": "商品分类",
@@ -163,6 +165,7 @@
"plugins-shop-design": "",
"plugins-shop-favor": "店铺收藏",
"plugins-shop-license": "工商资质",
+ "plugins-shop-check": "订单核销",
"plugins-activity-index": "所有活动",
"plugins-activity-detail": "活动详情",
"plugins-label-detail": "标签详情",
@@ -182,6 +185,7 @@
"plugins-realstore-batchorder-list": "批次订单",
"plugins-realstore-frequencycard-list": "次卡",
"plugins-realstore-frequencycard-used": "次卡使用记录",
+ "plugins-realstore-check": "订单核销",
"plugins-binding-index": "组合搭配",
"plugins-binding-detail": "组合搭配详情",
"plugins-delivery-order": "配送订单",
diff --git a/pages.json b/pages.json
index 04d12ca0..895da5f1 100644
--- a/pages.json
+++ b/pages.json
@@ -1092,6 +1092,13 @@
"enablePullDownRefresh": true,
"navigationBarTitleText": ""
}
+ },
+ {
+ "path": "check/check",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": ""
+ }
}
]
},
@@ -1257,6 +1264,13 @@
"enablePullDownRefresh": true,
"navigationBarTitleText": ""
}
+ },
+ {
+ "path": "check/check",
+ "style": {
+ "enablePullDownRefresh": false,
+ "navigationBarTitleText": ""
+ }
}
]
},
diff --git a/pages/plugins/giftcard/form/form.vue b/pages/plugins/giftcard/form/form.vue
index bb9d4d90..ba465e27 100644
--- a/pages/plugins/giftcard/form/form.vue
+++ b/pages/plugins/giftcard/form/form.vue
@@ -7,13 +7,17 @@
{{$t('giftcard-index.giftcard-index.hfg2fg')}}
-
+
-
+
-
+
+
+
+ {{error_msg}}
+ {{success_msg}}
@@ -33,7 +37,9 @@
data_list_loding_status: 1,
data_list_loding_msg: '',
form_submit_loading: false,
- secret_key_value: ''
+ secret_key_value: '',
+ error_msg: '',
+ success_msg: ''
};
},
components: {
@@ -93,6 +99,10 @@
// 表单提交
form_submit() {
+ this.setData({
+ error_msg: '',
+ success_msg: ''
+ });
var form_data = {
secret_key: this.secret_key_value
}
@@ -114,11 +124,14 @@
success: (res) => {
uni.hideLoading();
if (res.data.code == 0) {
- app.globalData.showToast(res.data.msg, 'success');
var self = this;
+ self.setData({
+ error_msg: '',
+ success_msg: res.data.msg,
+ });
setTimeout(function() {
self.setData({
- form_submit_loading: false
+ form_submit_loading: false,
});
if(app.globalData.prev_page() == null) {
app.globalData.url_open('/pages/plugins/giftcard/index/index', true);
@@ -129,18 +142,20 @@
} else {
if (app.globalData.is_login_check(res.data, this, 'form_submit')) {
this.setData({
- form_submit_loading: false
+ form_submit_loading: false,
+ error_msg: res.data.msg,
+ success_msg: '',
});
- app.globalData.showToast(res.data.msg);
}
}
},
fail: () => {
- this.setData({
- form_submit_loading: false
- });
uni.hideLoading();
- app.globalData.showToast(this.$t('common.internet_error_tips'));
+ this.setData({
+ form_submit_loading: false,
+ error_msg: this.$t('common.internet_error_tips'),
+ success_msg: '',
+ });
},
});
}
@@ -148,5 +163,10 @@
}
};
-
\ No newline at end of file
diff --git a/pages/plugins/realstore/check/check.vue b/pages/plugins/realstore/check/check.vue
new file mode 100644
index 00000000..f1d1eb51
--- /dev/null
+++ b/pages/plugins/realstore/check/check.vue
@@ -0,0 +1,144 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/plugins/shop/check/check.vue b/pages/plugins/shop/check/check.vue
new file mode 100644
index 00000000..0e8a43fa
--- /dev/null
+++ b/pages/plugins/shop/check/check.vue
@@ -0,0 +1,144 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file