Browse Source

no message

leoone8322 1 year ago
parent
commit
bb060095e3
4 changed files with 50 additions and 14 deletions
  1. 1 1
      public/mall/spd.html
  2. 14 0
      public/proxy/ac.htm
  3. 18 10
      public/service/qw.html
  4. 17 3
      src/views/config/shop.vue

+ 1 - 1
public/mall/spd.html

@@ -159,7 +159,7 @@
       document.getElementById("coupon-web").innerHTML = coupon;
 
       //获取码对应的商品名称
-      let url = "https://jzmall.lifejingzhi.com/admin/coupon/getGoodsName?coupon=" + coupon;
+      let url = "https://mall.zhaijieshi.cc/admin/coupon/getGoodsName?coupon=" + coupon;
 
       $.ajax({
         type: 'get',

+ 14 - 0
public/proxy/ac.htm

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+    <meta name="renderer" content="webkit">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> 
+    <script> 
+       window.location.href='https://campaign.e-pointchina.com.cn/campaign/wx_entry/hema?app_id=hema&section=20220909SH' 
+    </script>
+  </head>
+  <body> 
+  </body>
+</html>

+ 18 - 10
public/service/qw.html

@@ -188,17 +188,11 @@
       } */
 
     .wechat-web-container wx-open-launch-weapp {
-      /* height: 45px;  
-        color:#fff;
-        background-color: #ce3406; 
-        margin-top: 30px;
-      position: absolute;*/
-      bottom: 100px;
-      left: 0;
-      right: 0;
       display: flex;
       flex-direction: column;
       align-items: center;
+      margin: 0px auto;
+      height: 60px;
     }
 
     .desktop-web-container {
@@ -240,8 +234,22 @@
       <!-- 跳转小程序的开放标签。文档 https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/Wechat_Open_Tag.html -->
       <wx-open-launch-weapp id="launch-btn" username="gh_e9b9499458d9" path="/pages/ucenter/wx/join"> 
         <template>
-          <button style="width: 184px; height: 45px; text-align: center; font-size: 17px; display: block; margin: 0 auto; padding: 8px 24px; border-radius: 40px;border: 1px solid #09afff; background-color: white; color:#09afff;">
-            一键唤起加企微</button>
+          <style>
+            .btn {
+              width: 184px; 
+              height: 45px; 
+              text-align: center; 
+              font-size: 17px; 
+              display: block; 
+              margin: 0 auto; 
+              padding: 8px 24px; 
+              border-radius: 40px;
+              border: 1px solid #09afff; 
+              background-color: white; 
+              color:#09afff;
+            }
+            </style>
+          <button  class="btn">一键唤起加企微</button>
         </template> 
       </wx-open-launch-weapp>
       

+ 17 - 3
src/views/config/shop.vue

@@ -25,6 +25,7 @@
       </el-table-column>
 
       <el-table-column align="center" label="城市" prop="sysCity.cityName" />
+      <el-table-column align="center" label="子商户号" prop="subMchId" />
       <el-table-column align="center" label="状态" prop="deleted">
         <template slot-scope="scope">
           <span v-if="scope.row.deleted == true">已停用</span>
@@ -44,12 +45,12 @@
 
     <!-- 添加或修改对话框 -->
     <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
-      <el-form ref="dataForm" :rules="rules" :model="dataForm" status-icon label-position="left" label-width="100px" style="width: 400px; margin-left:50px;">
+      <el-form ref="dataForm" :rules="rules" :model="dataForm" status-icon label-position="left" label-width="200px" style="width: 700px; margin-left:50px;">
         <el-form-item label="门店名称" prop="shopName">
           <el-input v-model="dataForm.shopName" />
         </el-form-item>
         <el-form-item label="门店编号" prop="shopNo">
-          <el-input v-model="dataForm.shopNo" />
+          <el-input v-model="dataForm.shopNo" placeholder="对应服务者系统中的售卖门店"/>
         </el-form-item>
         <el-form-item label="所属城市" prop="shopCity">
           <el-select v-model="dataForm.shopCity" clearable style="width: 200px" class="filter-item" placeholder="请选择所属城市">
@@ -63,6 +64,18 @@
           </el-select>
         </el-form-item>
 
+        <el-form-item label="门店支付子商户号" prop="subMchId">
+          <el-input v-model="dataForm.subMchId"  placeholder="不填写默认支付到鲸致" />
+        </el-form-item> 
+        
+        <el-form-item label="门店支付子商户Key" prop="mchKey">
+          <el-input v-model="dataForm.mchKey"  placeholder="子商户的支付key" />
+        </el-form-item>
+        
+        <el-form-item label="门店支付子商户密钥存放" prop="keyPath">
+          <el-input v-model="dataForm.keyPath"  placeholder="子商户的支付密钥存放地址" />
+        </el-form-item>
+
         <el-form-item label="状态" prop="deleted">
           <el-select v-model="dataForm.deleted" clearable style="width: 200px" class="filter-item" placeholder="请选择状态">
             <el-option v-for="type in deletedOptions" :key="type.value" :label="type.label" :value="type.value" />
@@ -177,7 +190,8 @@ export default {
       this.dataForm = {
         id: undefined,
         shopId: '',
-        shopName: ''
+        shopName: '',
+        deleted:false
       }
     },
     handleCreate() {