分类树

src/api/product.js

@@ -10,7 +10,10 @@
 import { dataURItoBlob } from 'dropzone'
 import request from './request'
 
-
+// 查询商品分类
+export function proCategoryListApi(data) {
+  return request.get('store/category/list', data)
+}
 
 // 导出商品数据
 export function outportApi(data) {
@@ -535,4 +538,4 @@ export function merProductLstApi(data) {
 /** 商品列表 -- 商品操作记录 */
 export function operateRecordList(id, data) {
   return request.get(`store/product/get_operate_list/${id}`, data)
-}
+}

src/views/merchant/list/handle/merEditForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-form ref="merDataField" size="small" :rules="ruleValidate" :model="merData" label-width="120px"
+  <el-form ref="merDataField" size="small" :rules="ruleValidate" :model="merData" label-width="150px"
            @submit.native.prevent>
     <el-tabs v-loading="loading" type="border-card" v-model="activeName">
       <el-tab-pane label="基本信息" name="detail">
@@ -127,8 +127,8 @@
           <div class="title">费用信息</div>
           <el-row :gutter="24" class="mt20">
             <el-col v-if="!isAdd" :span="24">
-              <el-form-item label="店铺保证金：" prop="ot_margin">
-                <span>{{ merData.is_margin == 0 ? '无' : merData.ot_margin + '元' }}</span>
+              <el-form-item label="店铺保证金：" prop="margin">
+                <span>{{ merData.is_margin == 0 ? '无' : merData.margin + '元' }}</span>
               </el-form-item>
             </el-col>
             <el-col v-if="!isAdd && merData.is_margin != 0" :span="24">
@@ -138,7 +138,13 @@
             </el-col>
             <el-col v-if="!isAdd && merData.is_margin != 0" :span="24">
               <el-form-item label="保证金余额：">
-                <span>{{ merData.margin }}</span>
+                <span>{{ merData.ot_margin }}</span>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="自动扣除保证金比例：" prop="auto_margin_rate">
+                <el-input-number :min="0" v-model="merData.auto_margin_rate" size="small" controls-position="right"
+                                 placeholder="请输入自动扣除保证金比例"/>%
               </el-form-item>
             </el-col>
             <el-col :span="24">

src/views/merchant/list/handle/merInfo.vue

@@ -58,7 +58,7 @@
               <div class="value">
                 {{merData.commission_switch ? "开启" : "关闭"}}
               </div>
-            </li>  
+            </li>
             <li v-if="merData.commission_switch" class="item item100">
               <div>手续费：</div>
               <div class="value">
@@ -69,7 +69,7 @@
             <li class="item">
               <div>店铺保证金：</div>
               <div class="value">
-                {{merData.is_margin == 0 ? '无' : merData.ot_margin}}
+                {{merData.is_margin == 0 ? '无' : merData.margin}}
               </div>
             </li>
             <li v-if="merData.is_margin != 0" class="item">
@@ -80,8 +80,8 @@
             </li>
             <li v-if="merData.is_margin != 0" class="item">
               <div>保证金余额：</div>
-              <div class="value">{{merData.margin}}</div>
-            </li> 
+              <div class="value">{{merData.ot_margin}}</div>
+            </li>
           </ul>
         </div>
         <div class="section">
@@ -116,9 +116,9 @@
               <div>商户资质：</div>
               <div class="value">
                 <el-image
-                  v-for="(item, index) in merData.mer_certificate" 
-                  :key="index" 
-                  :src="item" 
+                  v-for="(item, index) in merData.mer_certificate"
+                  :key="index"
+                  :src="item"
                   @click="lookImg(item)"
                   style="width: 36px;height: 36px;margin-right: 5px;"
                   />
@@ -140,7 +140,7 @@
             <li class="item">
               <div>登录密码：</div>
               <div class="value">{{merData.mer_password}}</div>
-              
+
             </li>
             <li class="item">
               <div>联系人：</div>
@@ -149,7 +149,7 @@
             <li class="item">
               <div>联系电话：</div>
               <div class="value">{{merData.mer_phone}}</div>
-            </li> 
+            </li>
             <!-- <li class="item">
               <div>绑定手机号：</div>
               <div class="value">{{merData.real_name}}</div>
@@ -157,7 +157,7 @@
             <li class="item">
               <div>绑定微信用户昵称/ID：</div>
               <div class="value">{{merData.real_name}}</div>
-            </li>  --> 
+            </li>  -->
           </ul>
         </div>
         <div v-if="merData.sub_mchid" class="section">
@@ -252,8 +252,8 @@
     </el-tabs>
      <div class="images" v-show="false" v-viewer="{ movable: false }">
       <img v-for="(src,index) in merData.mer_certificate" :src="src" :key="index" />
-    </div> 
-  </div>   
+    </div>
+  </div>
 </template>
 <script>
 // +----------------------------------------------------------------------

src/views/merchant/type/typeEditForm.vue

@@ -28,16 +28,16 @@
             <el-col :span="12">
               <el-form-item label="商户是否隐藏：" prop="is_allow_apply">
                 <el-select v-model="formValidate.is_allow_apply" placeholder="请选择商家申请类型">
-                  <el-option label="是" value="1"></el-option>
-                  <el-option label="否" value="0"></el-option>
+                  <el-option label="是" :value="1"></el-option>
+                  <el-option label="否" :value="0"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="搜索商家：" prop="is_search_display">
                 <el-select v-model="formValidate.is_search_display" placeholder="请选择搜索商家是否展示">
-                  <el-option label="是" value="1"></el-option>
-                  <el-option label="否" value="0"></el-option>
+                  <el-option label="是" :value="1"></el-option>
+                  <el-option label="否" :value="0"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -310,4 +310,4 @@ export default {
 .gary {
   color: #aaa;
 }
-</style>
+</style>

src/views/product/productClassify/index.vue

@@ -13,8 +13,10 @@
         :data="tableData.data"
         size="small"
         row-key="store_category_id"
+        :lazy="true"
+        :load="load"
         :default-expand-all="false"
-        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+        :tree-props="{children: 'children', hasChildren: 'child'}"
       >
         <el-table-column
           label="分类名称"
@@ -99,8 +101,8 @@
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
 import {
-  storeCategoryListApi, storeCategoryCreateApi, storeCategoryUpdateApi, storeCategoryDeleteApi, 
-  storeCategoryStatusApi, storeCategoryRecommendApi
+  storeCategoryListApi, storeCategoryCreateApi, storeCategoryUpdateApi, storeCategoryDeleteApi,
+  storeCategoryStatusApi, storeCategoryRecommendApi, proCategoryListApi
 } from '@/api/product'
 export default {
   name: 'ProductClassify',
@@ -126,10 +128,15 @@ export default {
     // 列表
     getList() {
       this.listLoading = true
-      storeCategoryListApi(this.tableFrom).then(res => {
-        this.tableData.data = res.data
+      proCategoryListApi(this.tableFrom).then(res => {
+        // res.data.map(i=>{
+        //   this.$set(i,'children',[]);
+        //   this.$set(i,'hasChildren',true);
+        // })
+        this.tableData.data = res.data;
         this.tableData.total = res.data.count
         this.listLoading = false
+        this.$forceUpdate();
       }).catch(res => {
         this.listLoading = false
         this.$message.error(res.message)
@@ -143,6 +150,14 @@ export default {
       this.tableData.limit = val
       this.getList()
     },
+    load(tree,treeNode,resolve){
+      console.log(tree.store_category_id)
+      // console.log(treeNode)
+      proCategoryListApi({category_id:tree.store_category_id}).then(res=>{
+        console.log(res.data)
+        resolve(res.data)
+      })
+    },
     // 添加
     onAdd() {
       this.$modalForm(storeCategoryCreateApi()).then(() => this.getList())

vue.config.js

@@ -24,10 +24,10 @@ module.exports = {
    * In most cases please use '/' !!!
    * Detail: https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: '/',
+  publicPath: '/admin',
   outputDir: 'dist',
-  assetsDir: 'system',
-  indexPath: process.env.NODE_ENV === 'development' ? 'index.html' : 'system.html',
+  assetsDir: 'static',
+  indexPath: 'index.html',
   lintOnSave: process.env.NODE_ENV === 'development',
   productionSourceMap: false,
   devServer: {