diff --git a/api/admin.js b/api/admin.js
index 9566dee..0908c65 100644
--- a/api/admin.js
+++ b/api/admin.js
@@ -7,6 +7,18 @@ import request from "@/utils/request.js";
export function getStatisticsInfo() {
return request.get("admin/order/statistics", {}, { login: true });
}
+/**
+ * 设置金额获取二维码
+ */
+export function setOrderCreate(merId,data) {
+ return request.post(`admin/${merId}/order_create`, data, { login: true });
+}
+/**
+ * 设置金额获取二维码
+ */
+export function getOrderOfflinePay(merId) {
+ return request.get(`order/offline_pay/${merId}`, {}, { login: true });
+}
/**
* 订单月统计
*/
diff --git a/pages.json b/pages.json
index 9d9b4c7..c388f55 100644
--- a/pages.json
+++ b/pages.json
@@ -637,6 +637,12 @@
"navigationBarTitleText": "订单列表"
}
},
+ {
+ "path": "qrcode/index",
+ "style": {
+ "navigationBarTitleText": "我要收款"
+ }
+ },
{
"path": "orderRefund/index",
"style": {
diff --git a/pages/admin/business/index.vue b/pages/admin/business/index.vue
index ef8d70b..0181ee5 100644
--- a/pages/admin/business/index.vue
+++ b/pages/admin/business/index.vue
@@ -67,7 +67,7 @@
if(this.service.is_goods){
list.push({
title: '我要收款',
- url: '/pages/product/list/index?mer_id=' + merId,
+ url: '/pages/admin/qrcode/index?mer_id=' + merId,
icon: 'haiyuefont haiyue-shoukuang'
});
}
diff --git a/pages/admin/qrcode/index.vue b/pages/admin/qrcode/index.vue
new file mode 100644
index 0000000..c8a2058
--- /dev/null
+++ b/pages/admin/qrcode/index.vue
@@ -0,0 +1,295 @@
+
+
+
+
+
+
+
+
+
+
+ 扫一扫向我付款
+
+
+
+
+ 设置金额
+
+
+
+
+ 已设置金额:{{formData.amount}}
+ 设置金额
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/shop_details/index.vue b/pages/shop_details/index.vue
index 2183275..fdfdf62 100644
--- a/pages/shop_details/index.vue
+++ b/pages/shop_details/index.vue
@@ -15,7 +15,7 @@
评分4.5分
- 位置好找,菜味道不错,价格实惠
+ 商家承诺:
@@ -31,7 +31,14 @@
周一到周日
09:00 - 22:00
- 可提供:
+
+
+
+ 商家电话:15834567081
+
+ 复制
+
+ 可提供:
WiFi
充电宝
@@ -86,6 +93,39 @@
handleTab(i){
this.actIndex = i
},
+ setCopy(content) {
+ // 该方法不支持h5
+ //#ifndef APP-PLUS
+ uni.setClipboardData({
+ data: String(content), // 必须字符串
+ success: function() {
+ console.log('success');
+ }
+ });
+ //#endif
+
+ // h5端赋值方法,使用创建节点
+ // #ifdef H5
+ if (!document.queryCommandSupported('copy')) { // 兼容某些浏览器的判断
+ console.log('该浏览器不支持')
+ }
+ let textarea = document.createElement("textarea")
+ textarea.value = content
+ textarea.readOnly = "readOnly"
+ document.body.appendChild(textarea)
+ textarea.select() // 选择对象
+ textarea.setSelectionRange(0, content.length) // 核心
+ let result = document.execCommand("copy") // 执行浏览器复制命令
+ if (result) {
+ uni.showToast({
+ title: '复制成功',
+ duration: 2000,
+ icon:'none'
+ });
+ }
+ textarea.remove()
+ // #endif
+ },
handlePay(){
// 从相机和相册扫码
// #ifdef APP-PLUS
@@ -120,6 +160,11 @@