Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep

src/components/Index.vue

@@ -735,13 +735,9 @@
       //修改版权
       TestMiniApp() {
         var cmdStr = "";
-        //cmdStr = "/api/test/get";
         //cmdStr="/api/Mall/GetHome";
-        //cmdStr = "/api/MemberUser/SetMemberPhoto";
         var postData = {
-        //    Id:1,
-        //    AliasName:"HK",
-        //    Photo:"1111"
+          
         };
         if (cmdStr != "") {
           this.apipost(cmdStr, postData, res => {

src/components/UserMan/usersListEdit.vue

@@ -26,9 +26,8 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="职位">
-          <el-select size="small" v-model="userInfo.PostId"   
-            placeholder="请选择">
+        <el-form-item label="职位" v-if="mall_userInfo.TenantId==1 &&  mall_userInfo.MallBaseId==1">
+          <el-select size="small" v-model="userInfo.PostId" placeholder="请选择">
             <el-option label="无" :value="0"></el-option>
             <el-option label="领队导游" :value="1"></el-option>
           </el-select>
@@ -96,11 +95,13 @@
           Id: 0,
           Moblie: ''
         },
+        mall_userInfo: {}, //用户信息
         tableData: [],
         options: [],
       };
     },
     created() {
+      this.mall_userInfo = JSON.parse(localStorage.mall_userInfo)
       if (this.$route.query.UserId) {
         this.UserId = this.$route.query.UserId;
         this.getData()

src/components/mallIndex.vue

@@ -472,9 +472,9 @@
         <div class="el-mallIndex_btmheader">
           <span>用户购买力TOP排行</span>
           &nbsp;&nbsp;
-          <el-radio  v-model="basicQMsg.UserType" @change="getChange" :label="0">普通用户
+          <el-radio v-model="basicQMsg.UserType" @change="getChange" :label="0" v-if="mall_userInfo.TenantId==1 &&  mall_userInfo.MallBaseId==1">普通用户
           </el-radio>
-          <el-radio  v-model="basicQMsg.UserType" @change="getChange" :label="1">领队导游
+          <el-radio v-model="basicQMsg.UserType" @change="getChange" :label="1" v-if="mall_userInfo.TenantId==1 &&  mall_userInfo.MallBaseId==1">领队导游
           </el-radio>
           <el-button type="primary" class="ZexportBtn" size="mini" @click="DownLoadSalesUser">导出TOP100</el-button>
         </div>
@@ -561,9 +561,12 @@
         salesData: {}, //销售数据
         saleIncomeData: [], //商品购买力TOP排行
         saleUserData: [], //用户购买力TOP排行
+        mall_userInfo: {}, //用户信息
       };
     },
-    created() {},
+    created() {
+      this.mall_userInfo = JSON.parse(localStorage.mall_userInfo)
+    },
     methods: {
       //清空选择
       ClearMsg() {