app版本管理以及商户信息修改

src/api/app.js

@@ -231,3 +231,35 @@ export function routineStatusApi(id, data) {
  export function routineInfo() {
   return request.get(`config/setting/routine/config`)
 }
+
+/**
+ * @description 查看app版本详情
+ */
+export function appDetail(id) {
+  return request.get(`app/version/detail/${id}`)
+}
+/**
+ * @description 创建app版本
+ */
+export function appCreate(data) {
+  return request.post(`app/version/create`, data)
+}
+/**
+ * @description 获取app版本列表
+ */
+export function appLst(data) {
+  return request.get(`app/version/lst`, data)
+}
+/**
+ * @description 编辑app版本详情
+ */
+export function appEdit(id,data) {
+  return request.post(`app/version/edit/${id}`,data)
+}
+/**
+ * @description 删除app版本
+ */
+export function appDelete(id) {
+  return request.post(`app/version/delete/${id}`)
+}
+

src/components/uploadPicture/index.vue

@@ -79,12 +79,12 @@
               @click="checkPics"
             >使用选中图片</el-button>
             <el-upload
-              class="upload-demo mr10 mb15"
+              class="upload-demo"
               :action="fileUrl"
               :on-success="handleSuccess"
               :headers="myHeaders"
               :show-file-list="false"
-              multiple
+           
             >
               <el-button size="mini" type="primary">点击上传</el-button>
             </el-upload>

src/libs/settingMer.js

@@ -13,6 +13,8 @@ const VUE_APP_API_URL = process.env.VUE_APP_BASE_API || `${location.origin}`
 const VUE_APP_API_URL_Two = process.env.VUE_APP_BASE_API_Two || `${location.origin}`
 const VUE_APP_WS_URL = process.env.VUE_APP_WS_URL || (location.protocol === 'https:' ? 'wss' : 'ws') + ':' + location.hostname
 const login_title = Cookies.get('MerInfo') ? JSON.parse(Cookies.get('MerInfo')).login_title : ''
+
+console.log(VUE_APP_API_URL,'1111111111')
 const SettingMer = {
   // 服务器地址
   httpUrl: VUE_APP_API_URL,

src/router/index.js

@@ -75,6 +75,7 @@ export const constantRoutes = [
         name: 'Dashboard',
         meta: { title: '控制台', icon: 'dashboard', affix: true }
       }
+     
     ]
   },
   {
@@ -180,6 +181,7 @@ export const constantRoutes = [
     },
     component: () => import('@/components/uploadVideo/index')
   },
+ 
   { path: '*', redirect: roterPre + '/404', hidden: true }
 ]
 

src/router/modules/app.js

@@ -27,6 +27,13 @@ const appRouter =
             noCache: true
           },
           component: () => import('@/views/app/wechat/menus/index')
+        }, {
+          path: 'version',
+          name: `appversion`,
+          meta: {
+            title: 'app版本管理'
+          },
+          component: () => import('@/views/system/appvison')
         },
         {
           path: 'wechat/reply',

src/views/merchant/application/index.vue

@@ -128,13 +128,13 @@
         <el-table-column prop="mark" label="备注" min-width="150" />
         <el-table-column label="操作" min-width="280" fixed="right" align="center">
           <template slot-scope="scope">
-            <el-button
+            <!-- <el-button
               v-if="scope.row.status == 0"
               type="text"
               size="small"
               @click="onchangeIsShow(scope.row.mer_intention_id)"
               >审核</el-button
-            >
+            > -->
             <el-button
               type="text"
               size="small"

src/views/merchant/list/index.vue

@@ -239,7 +239,7 @@
       </div>
     </el-card>
     <!-- 添加商户弹出层 -->
-    <el-dialog title="添加商品" :visible.sync="popFormVisible" @close="close('form')">
+    <el-dialog :title="edit==0?'新增商户信息':'编辑商户信息'" :visible.sync="popFormVisible" @close="close('form')">
       <el-form :model="form" :rules="rules" ref="form">
         <el-form-item label="商户名称" :label-width="formLabelWidth" prop="mer_name">
           <el-input v-model="form.mer_name" autocomplete="off" placeholder="请输入商户名称"></el-input>
@@ -302,6 +302,9 @@
             <el-input v-model="form.auto_margin_rate" style="width:200px" autocomplete="off"></el-input>
           </el-form-item>
         </div>
+        <el-form-item label="首次缴纳保证金" :label-width="formLabelWidth" prop="first_margin">
+            <el-input v-model="form.first_margin"  placeholder="请输入首次缴纳保证金" style="width:200px" autocomplete="off"></el-input>
+          </el-form-item>
         <el-form-item label="商户姓名" :label-width="formLabelWidth" prop="real_name">
           <el-input v-model="form.real_name" autocomplete="off" placeholder="请输入商户姓名"></el-input>
         </el-form-item>
@@ -454,6 +457,7 @@ export default {
         mer_name: "", //店铺名称
         category_id: "", //商品分类
         type_id: "",
+        first_margin:'',//首次支付缴纳保证金
         info: "", //区
         info1: "", //街道
         info2: "", //村
@@ -542,6 +546,7 @@ export default {
       },
       autoUpdate: true,
       timeVal: [],
+      edit:0
     };
     
   },
@@ -743,6 +748,7 @@ export default {
     },
     // 获取开启商户数
     getHeadNum() {
+      console.log('2222222222222')
       merchantCountApi()
         .then(res => {
           this.headeNum[0]["count"] = res.data.valid;
@@ -823,11 +829,13 @@ export default {
     // 添加
     onAdd() {
       this.add = true;
+      this.edit=0
       this.popFormVisible = true;
       // this.$modalForm(merchantCreateApi()).then(() => this.getList(""));
     },
     // 编辑
     async onEdit(id) {
+      this.edit=1
       //调用获取商圈
       this.popFormVisible = true; //开启编辑表单
       this.add = false;
@@ -838,6 +846,7 @@ export default {
       this.merid = res.mer_id;
       this.form.mer_name = res.mer_name; //商户名称
       this.form.category_id = res.category_id;
+      this.form.first_margin=res.first_margin;
       this.form.type_id = res.type_id;
       this.form.mer_account = res.mer_account;
       this.form.mer_password = res.mer_password;

src/views/merchant/type/index.vue

@@ -16,6 +16,13 @@
               }}</span>
             </template>
           </el-table-column>
+          <el-table-column prop="type_name" label="首次缴纳保证金" min-width="200">
+            <template slot-scope="scope">
+              <span class="spBlock">{{
+                scope.row.first_margin ? scope.row.first_margin + "元" : "无"
+              }}</span>
+            </template>
+          </el-table-column>
           <el-table-column prop="type_info" label="店铺类型要求" min-width="300" />
           <el-table-column prop="create_time" label="创建时间" min-width="150" />
           <el-table-column prop="update_time" label="最新修改时间" min-width="150" />
@@ -78,6 +85,13 @@
             单位：元
           </div>
         </el-form-item>
+        <el-form-item label="首次缴纳保证金：">
+
+          <div  class="input_inline">
+            <el-input v-model="formValidate.first_margin" @change="fimargin" placeholder="请输入单位" />
+            单位：元
+          </div>
+        </el-form-item>
         <el-form-item label="店铺权限：" prop="auth">
           <el-tree ref="tree" :data="permissions" show-checkbox node-key="value" ::default-checked-keys="formValidate.auth || []" @hook:mounted="$refs.tree.setCheckedKeys(formValidate.auth || [])" @check="
               [
@@ -121,6 +135,10 @@
           {{
             formDetailValidate.margin ? formDetailValidate.margin : "暂无数据"
           }}</el-form-item>
+          <el-form-item label="首次缴纳保证金：">
+          {{
+            formDetailValidate.first_margin ? formDetailValidate.first_margin : "暂无数据"
+          }}</el-form-item>
         <el-form-item label="店铺权限：">
           <el-tree ref="treeDetail" :data="formDetailValidate.options" :props="{ label: 'title' }"></el-tree>
         </el-form-item>
@@ -234,7 +252,8 @@ export default {
         is_allow_apply: "",
         is_search_display: "",
         type_code: "",
-        is_sync_prod: ""
+        is_sync_prod: "",
+        first_margin:0
       },
       ruleValidate: {
         type_name: [
@@ -311,6 +330,19 @@ export default {
       };
       this.$refs.tree && this.$refs.tree.setCheckedKeys([]);
     },
+    //获取保证金
+
+    fimargin(e){
+      console.log(e,this.formValidate.margin,e>this.formValidate.margin)
+      if(this.formValidate.is_margin == 1){
+         if(Number(e)>Number(this.formValidate.margin)){
+          this.$message({
+          message: '警告,首次缴纳保证金不能超过店铺保证金',
+          type: 'warning'
+          });
+         }
+      }
+    },
     //获取权限
     jurisdiction() {
       storeJurisdictionApi().then((res) => {
@@ -361,6 +393,7 @@ export default {
         type_info: row.type_info,
         is_margin: row.is_margin || 0,
         margin: row.margin || 0,
+        first_margin: row.first_margin || 0,
         auth: row.auth_ids,
         description: row.description,
         is_allow_apply: row.is_allow_apply.toString(),