11

src/components/UserMan/usersList.vue

@@ -182,6 +182,7 @@
             <div v-show="scope.row.OpenIdState">{{ scope.row.OpenId }}</div>
           </template>
         </el-table-column>
+        <el-table-column prop="Moblie" label="手机号码"> </el-table-column>
         <el-table-column prop="PostName" label="职位"> </el-table-column>
         <el-table-column label="会员类型">
           <template slot-scope="scope">

src/components/UserMan/usersListEdit.vue

@@ -126,6 +126,7 @@
           PostId: userInfo.PostId,
           Blacklist:userInfo.Blacklist,
           IsAdmin:userInfo.IsAdmin,
+          Moblie:userInfo.Moblie,
         }
         this.apipost("/api/user/SetMemberUserInfoForHT", this.addMsg, res => {
           if (res.data.resultCode == 1) {

src/components/sallCenter/plugin/tradeActivity.vue

@@ -28,10 +28,10 @@
       <div class="diy-link" flex="cross:center;" style="background:#fff;">
         <div flex="dir:left cross:center" style="margin:20px;justify-content:space-between;">
           <div class="title" style="text-align: left">
-            活动名称：萨达
+            活动名称：2026年首店活动
           </div>
           <div class="title" style="text-align: left;margin-left:20px;">
-            默认活动编号： 123
+            默认活动编号： No.10001
           </div>
         </div>
       </div>

src/components/sallCenter/plugin/tradeIndex.vue

+<style>
+  .tradeAdd{
+    width: 40px;
+    height: 40px;
+    border: 1px solid #d1d1d1;
+    border-radius: 50%;
+    text-align: center;
+    line-height: 35px;
+    font-size: 30px;
+    color: #d1d1d1;
+    background-color: #409EFF;
+    cursor: pointer;
+    color:#fff;
+  }
+</style>
+<template>
+  <div :class="{'active':tradeIndexData.isCked}">
+    <div class="diy-component-options" v-if="tradeIndexData.isCked">
+      <el-button type="primary" icon="el-icon-delete" style="left: -25px; top: 0px;" @click="delPlugin()"></el-button>
+      <el-button type="primary" icon="el-icon-document-copy" style="left: -25px; top: 30px;"></el-button>
+      <el-button type="primary" icon="el-icon-arrow-up" v-if="index>0" @click="resetSord(0)"
+        style="right: -25px; top: 0;"></el-button>
+      <el-button type="primary" icon="el-icon-arrow-down" v-if="index!=dataLeng-1" @click="resetSord(1)"
+        style="right: -25px; top: 30px;"></el-button>
+    </div>
+    <div class="diy-component-preview">
+      <div class="diy-link" flex="cross:center;" style="background:#fff;">
+        <div flex="dir:left cross:center" style="margin:20px;justify-content:space-between;">
+          <div class="title" style="text-align: left">
+            首页组件
+          </div>
+          <div class="title" style="text-align: left;margin-left:20px;">
+            组件编号： tradeIndex
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="diy-component-edit tradeActiviTy" v-if="tradeIndexData.isCked">
+      <div v-for="(item,index) in tradeIndexData.data" :key="index" style="position:relative;border:1px solid #d1d1d1;width:345px;margin-bottom:20px;">
+        <el-form label-width="100px" @submit.native.prevent >
+          <el-form-item label="活动名称">
+            <el-input size="small" style="width:200px;" v-model="item.GroupName"></el-input>
+          </el-form-item>
+          <el-form-item label="日期">
+            <el-input size="small" style="width:200px;" v-model="item.DateStr"></el-input>
+          </el-form-item>
+          <el-form-item label="活动编号">
+            <el-input size="small" style="width:200px;" v-model="item.NewActivitys"></el-input>
+          </el-form-item>
+          <el-form-item label="是否默认活动">
+            <el-radio v-model="item.IsDefaultActivity" :label="0">否</el-radio>
+            <el-radio v-model="item.IsDefaultActivity" :label="1">是</el-radio>
+          </el-form-item>
+        </el-form>
+        <div style="position:absolute;right:0;top:0;width:20px;height:20px;
+          border-radius:50%;background-color:red;color:#fff;text-align:center;cursor:pointer;" @click="removeTrade(index)">
+          <i class="el-icon-close"></i>
+        </div>
+      </div>
+      <div class="tradeAdd" @click="addAtradeObj()">+</div>
+    </div>
+  </div>
+</template>
+<script>
+ 
+  export default {
+    props: ["tradeIndexData", "index", "dataLeng"],
+    components: {
+ 
+    },
+    data() {
+      return {
+        choicImg: false,
+        isShowLink: false,
+        data: this.tradeIndexData.data,
+      };
+    },
+    watch: {
+      tradeIndexData(newVal, oldVal) {
+        this.data = this.tradeIndexData.data;
+      },
+    },
+    created() {
+
+    },
+    methods: {
+      //向父组件传值 并调用排序
+      resetSord(IsUp) {
+        this.$emit('getSord', this.index, IsUp);
+      },
+      //点击触发父组件删除
+      delPlugin() {
+        this.$emit('comDelPlugin', this.index);
+      },
+      //点击添加
+      addAtradeObj(){
+        let obj={
+          GroupName:'',
+          DateStr:'',
+          NewActivity:'',
+          IsDefaultActivity:0 //0不是 1是
+        }
+        this.tradeIndexData.data.push(obj);
+      },
+      //删除
+      removeTrade(index){
+        this.tradeIndexData.data.splice(index,1);
+      }
+    },
+    computed: {
+
+    },
+    mounted() {
+
+    }
+  };
+
+</script>

src/components/sallCenter/templateEdit.vue

@@ -325,6 +325,8 @@
                   @comDelPlugin="comDelPlugin" :index="index" :dataLeng="dataList.length"></tradeCustom>
                 <tradeActivity v-if="item.Id == 'tradeActivity'" :tradeActivityData="item" @getSord="getSord"
                   @comDelPlugin="comDelPlugin" :index="index" :dataLeng="dataList.length"></tradeActivity>
+                <tradeIndex v-if="item.Id == 'tradeIndex'" :tradeIndexData="item" @getSord="getSord"
+                  @comDelPlugin="comDelPlugin" :index="index" :dataLeng="dataList.length"></tradeIndex>
               </div>
             </div>
           </div>
@@ -449,6 +451,7 @@
   import Posts from "./plugin/posts.vue"; //贴子插件
   import tradeCustom from "./plugin/tradeCustom.vue" //自定义首店
   import tradeActivity from "./plugin/tradeActivity.vue" //首店活动
+  import tradeIndex from "./plugin/tradeIndex.vue" //首店首页
   export default {
     data() {
       return {
@@ -527,7 +530,8 @@
       miaiactivityCustom,
       Posts, //帖子
       tradeCustom,
-      tradeActivity
+      tradeActivity,
+      tradeIndex, //首店首页数据组件
     },
     methods: {
       //选择图片
@@ -1644,6 +1648,15 @@
             };
             this.dataList.push(tradeActivityObj);
             break;
+            //首店首页
+          case "tradeIndex":
+            let tradeIndexObj = {
+              Id: "tradeIndex",
+              isCked: false,
+              data: []
+            };
+            this.dataList.push(tradeIndexObj);
+            break;
         }
       },
       //给子组件调用 重新排序上移下移

src/components/tradePavilion/addbrand.vue

@@ -6,12 +6,9 @@
     </div>
     <div class="content">
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="150px" style="width: 70%">
-        <el-form-item label="品牌分类" class="is-required" prop="BrandClassId">
-          <el-select class="w300" v-model="addMsg.BrandClassId" size="small" placeholder="请选择">
-            <el-option :key="0" label="请选择" :value="0"></el-option>
-            <el-option v-for="item in BrandClassList" :key="item.ID" :label="item.ClassName" :value="item.ID">
-            </el-option>
-          </el-select>
+        <el-form-item label="品牌分类" class="is-required"  >
+          <el-cascader class="w300" size="small" placeholder="请选择"  
+            v-model="addMsg.MoreBrandClassIdList" :options="BrandClassList"></el-cascader>
         </el-form-item>
         <el-form-item label="品牌全名" prop="FullBrandName" class="is-required" size="small">
           <el-input v-model="addMsg.FullBrandName" class="w600" placeholder="请输入品牌全名" maxlength="100" />
@@ -286,6 +283,7 @@
           IsInChengdu: 0, //是否成都落地
           ContactName: "", //联系人
           ContactPhone: "", //联系电话
+          MoreBrandClassIdList:[],//分类层级Id
         },
         loadingPeople: false,
         dynamicTags: [],
@@ -378,7 +376,7 @@
         this.changeState1 = false;
       },
       getBrandClassList() {
-        this.apipost("/api/Trade/GetBrandClassList", {
+        this.apipost("/api/Trade/GetBrandClassTree", {
           BrandCategory: 3
         }, (res) => {
           if (res.data.resultCode == 1) {

src/components/tradePavilion/brandManagement.vue

@@ -122,12 +122,19 @@
     </div>
     <div style="padding: 20px; background: #fff">
       <el-table :data="dataList" header-cell-class-name="headClass" style="width: 100%" border>
-        <el-table-column prop="Id" label="ID" width="100">
+        <el-table-column prop="Id" label="ID" width="70">
           <template slot-scope="scope">
             <span @click="goRecruit(scope.row.ID)">{{ scope.row.ID }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="ClassName" label="分类" width="150">
+        <el-table-column prop="BrandClassList" label="分类" width="100">
+          <template slot-scope="scope">
+            <template v-if="scope.row.BrandClassList&&scope.row.BrandClassList.length>0">
+              <el-tag v-for="(tagItem,tagIndex) in scope.row.BrandClassList" :key="tagIndex">
+                {{ tagItem.Name }}
+              </el-tag>
+            </template>
+          </template>
         </el-table-column>
         <el-table-column prop="BrandName" label="品牌"> </el-table-column>
         <el-table-column prop="Logo" label="Logo" width="100">
@@ -161,10 +168,7 @@
         <el-table-column prop="UserName" width="100" label="认证用户"></el-table-column>
         <el-table-column prop="IsRecommend" label="是否推荐" width="120">
           <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.IsRecommend"
-              :active-value="1"
-              :inactive-value="0"
+            <el-switch v-model="scope.row.IsRecommend" :active-value="1" :inactive-value="0"
               @change="changeRecommend(scope.row, $event)">
             </el-switch>
           </template>