diff --git a/.env.production b/.env.production index 1db13cc..2a4f841 100644 --- a/.env.production +++ b/.env.production @@ -3,13 +3,13 @@ ENV = 'production' # 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇,Nginx 配置 # 接口地址,注意协议,如果你没有配置 ssl,需要将 https 改为 http # 测试 -# VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn' +VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn' # 生产 # VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn' # 预发布接口 -VUE_APP_BASE_API = 'https://pre-cashieradmin.sxczgkj.cn' +# VUE_APP_BASE_API = 'https://pre-cashieradmin.sxczgkj.cn' # VUE_APP_BASE_API = 'http://192.168.2.98:8000' # 如果接口是 http 形式, wss 需要改为 ws diff --git a/src/api/application.js b/src/api/application.js index 8aa460c..22e3b3f 100644 --- a/src/api/application.js +++ b/src/api/application.js @@ -15,14 +15,26 @@ export function tbPrintMachine(data, method = "post") { }); } +// 开票 +export function getbinding(data) { + return request({ + url: "/api/tbShopInfo/binding", + method: "post", + data: { + shopId: localStorage.getItem("shopId"), + ...data + } + }); +} /** * 获取应用中心列表 * @returns */ -export function appCenterGet() { +export function appCenterGet(params) { return request({ url: "/api/appCenter", - method: "get" + method: "get", + params }); } diff --git a/src/views/application/index.vue b/src/views/application/index.vue index 272be30..ebb48f2 100644 --- a/src/views/application/index.vue +++ b/src/views/application/index.vue @@ -2,6 +2,15 @@
应用中心
+
+ +
+
开票
+
+ +
+
+
@@ -12,21 +21,64 @@
+ + + + + + + +
联系区域经理开通
+
更换绑定
+ +
+ + 取 消 + 确 定 + +
diff --git a/src/views/application/kp.png b/src/views/application/kp.png new file mode 100644 index 0000000..aa61e7a Binary files /dev/null and b/src/views/application/kp.png differ diff --git a/src/views/coupon_manage/add_coupon.vue b/src/views/coupon_manage/add_coupon.vue index 4c27a53..33bf501 100644 --- a/src/views/coupon_manage/add_coupon.vue +++ b/src/views/coupon_manage/add_coupon.vue @@ -81,9 +81,9 @@ - + @@ -97,7 +97,7 @@ - 全额满可用 + 金额满可用 @@ -158,9 +158,9 @@ - +
diff --git a/src/views/coupon_manage/components/coupon_details.vue b/src/views/coupon_manage/components/coupon_details.vue index 6e11f0c..c08f4f4 100644 --- a/src/views/coupon_manage/components/coupon_details.vue +++ b/src/views/coupon_manage/components/coupon_details.vue @@ -91,7 +91,7 @@
+
+
营销中心
+
+
+ +
+
{{ item.name }}
+
+ {{ item.value }} +
+
+
+
+
+ + + + + \ No newline at end of file diff --git a/src/views/product/index.vue b/src/views/product/index.vue index 3499939..38bbe20 100644 --- a/src/views/product/index.vue +++ b/src/views/product/index.vue @@ -189,11 +189,13 @@ style="margin-left: 20px !important;"> 编辑 --> - 编辑 - - 删除 - +
+ 编辑 + + 删除 + +
@@ -244,7 +246,7 @@ import { tbProductListV2, tbShopCategoryGet, tbProductDelete, tbProductIsHot, up import { hasPermission } from '@/utils/limits.js' export default { - name:'product', + name: 'product', components: { BindCons, StockHistory