安安

src/App.vue

@@ -12,6 +12,7 @@ export default {
 
 <style>
 @import "//at.alicdn.com/t/font_1769104_qg9btfnng5.css";
+@import "./assets/css/common.css";
 html,
 body {
   margin: 0;
@@ -21,6 +22,7 @@ body {
 *{
   margin:0;
   padding:0;
+  box-sizing: border-box;
 }
 #app {
   height: 100%;

src/assets/css/common.css

@@ -32,5 +32,11 @@
     background: #fff;
 }
 .w100{
-    width:100px;
+    width:100px!important;
+}
+.el-icon-search{
+    cursor: pointer;
+}
+.el-table img{
+    cursor: pointer;
 }

src/components/UserMan/MembershipGrade.vue

@@ -10,11 +10,11 @@
             <div class="searchInput">
                 <el-input style="display:inline-block;width:225px;height:30px"
                 placeholder="请输入会员名称搜索"
-                v-model="value"
+                v-model="msg.Name"
                 size="small"
                 clearable>
                 </el-input>
-                <span class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
+                <span @click="getList" class="el-icon-search" style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
             </div>
         </div>
         <el-table
@@ -22,51 +22,41 @@
             border
             style="width: 100%;margin:20px 0">
             <el-table-column
-            prop="ID"
+            prop="Id"
             label="ID">
             </el-table-column>
             <el-table-column
-            prop="address"
-            width="280"
+            prop="Name"
             label="会员等级">
-                <template slot-scope="scope">
-                    <div class="app-image" style="background-image: url('https://wx.qlogo.cn/mmopen/vi_32/HO8Q9ibH7UtSFzHs67f0MH6VWjftiboELYLBya5OxpZkHDlicLMq39gxRHS4NhOG1AUepQ13JdUyrT7eM52u6hAsg/132');
-                    background-size: cover; background-position: center center; width: 50px; height: 50px; border-radius: 0%; float: left; margin-right: 8px;"></div> 
-                    <div flex="dir:left cross:center">易飞易&港中旅小李15351281772</div> 
-                    <img style="width:24px;height:24px" src="../../assets/img/userman/wx.png" alt="" class="platform-img">
-                    <button type="button" class="el-button el-button--success" style="float: right; padding: 5px !important;">
-                        <span>显示OpenId</span>
-                    </button>
-                    <div>ow_7I5dE_g9Fe1BuBPKdk8RNtEj0</div> 
-                </template>  
             </el-table-column>
             <el-table-column
             prop="name"
             label="会员名称">
             </el-table-column>
             <el-table-column
-            prop="name"
+            prop="Discount"
             label="折扣">
             </el-table-column>
             <el-table-column
             prop="name"
             label="购买价格(元)">
                 <template slot-scope="scope">
-                    <span class="blue">0</span>
+                    <span class="blue">{{scope.row.MemberBuyMoney}}</span>
                 </template>
             </el-table-column>
             <el-table-column
             prop="name"
             label="累计金额升级条件(元)">
                 <template slot-scope="scope">
-                    <span class="blue">0</span>
+                    <span class="blue">{{scope.row.UpGradeMoney}}</span>
                 </template>
             </el-table-column>
             <el-table-column
             prop="name"
             label="启用状态">
                 <template slot-scope="scope">
-                    <span class="blue">0</span>
+                    <span v-if="scope.row.Enabled==1">是</span>
+                    <span v-if="scope.row.Enabled==2">否</span>
                 </template>
             </el-table-column>
             <el-table-column
@@ -75,8 +65,8 @@
             label="操作">
             <template slot-scope="scope">
                 <img style="width:32px;height:32px" src="../../assets/img/userman/edit.png" alt="">
-                <img style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/integral.png" alt="">
-                <img style="width:32px;height:32px" src="../../assets/img/userman/balance.png" alt="">
+                <img style="width:32px;height:32px;margin:0 10px" src="../../assets/img/userman/del.png" alt="">
+                <!-- <img style="width:32px;height:32px" src="../../assets/img/userman/balance.png" alt=""> -->
             </template>    
             </el-table-column>
         </el-table>
@@ -98,12 +88,13 @@
         dialogVisible:false,
         value:'',
         options:[],
-        tableData:[
-            {ID:'111'}
-        ],
+        tableData:[],
         msg:{
             pageIndex:1,
             pageSize:15,
+            Grade:0,
+            Name:'',
+            Enabled:0,
         },
         total:0,
         rules: {
@@ -116,9 +107,21 @@
       };
     },
     created() {
-
+        this.getList();
     },
     methods: {
+        getList(){
+            this.loading=true;
+            this.apipost("/api/user/GetMemberGradePageList", this.msg, res => {
+                this.loading=false;
+                if(res.data.resultCode==1){
+                    this.total=res.data.data.count;
+                    let pageData=res.data.data.pageData;
+                    this.tableData=pageData;
+                }
+                
+            })
+        },
         goUrl(){
             this.$router.push({
                 name: 'setMember',
@@ -131,9 +134,6 @@
             this.msg.pageIndex = val;
             this.getList();
         },
-        getList(){
-
-        },
 
     },
     mounted() {

src/components/UserMan/setMember.vue

@@ -32,11 +32,11 @@
                     </el-switch>
                 </el-form-item>
                 <el-form-item label="会员图标" prop="name">
-                    <el-button size="small">选择文件</el-button>
+                    <el-button @click="openChangeDig" size="small">选择文件</el-button>
                     <div><img style="width:80px;height:80px" src="../../assets/img/default.png" alt=""></div>
                 </el-form-item>
                 <el-form-item label="会员背景色" prop="name">
-                    <el-button size="small">选择文件</el-button>
+                    <el-button @click="openChangeDig" size="small">选择文件</el-button>
                     <div><img style="width:80px;height:80px" src="../../assets/img/default.png" alt=""></div>
                 </el-form-item>
                 <el-form-item label="累计金额自动升级">
@@ -85,7 +85,7 @@
                             width="180px"
                             label="权益图标">
                                 <template slot-scope="scope">
-                                    <el-button size="small">选择图片</el-button>
+                                    <el-button @click="openChangeDig" size="small">选择图片</el-button>
                                     <img style="margin-left: 10px;width:50px;height:50px" src="../../assets/img/default.png" alt="">
                                 </template>
                             </el-table-column>
@@ -129,12 +129,81 @@
     <div style="margin-top:20px">
         <el-button size="small" type="primary" @click="dialogVisible = false">保存</el-button>
     </div>
+    <!-- 选择文件 -->
+    <el-dialog title="选择文件" :visible.sync="changeState" width="1240px">
+      <el-row style="border: 1px solid rgb(227, 227, 227);">
+          <el-col :span="6" style="border-right: 1px solid rgb(227, 227, 227);">
+               <el-button style="margin-top: 12px;margin-left: 5%;" type="primary" size="small">添加分组</el-button>
+               <div style="margin:20px 0">    
+                    <el-input v-model="val" style="width:90%;margin:0 5%" placeholder="请输入分类名称搜索" size="small"></el-input>
+               </div>
+               <div class="el-scrollbar" style="height: 450px; width: 100%;">
+                   <div class="el-scrollbar__wrap" style="margin-bottom: -8px; margin-right: -8px;">
+                       <div class="el-scrollbar__view">
+                            <li  class="el-menu-item" style="padding-left: 10px;padding-right: 10px;">
+                               <i class="el-icon-tickets"></i> 
+                               <span>全部</span>
+                            </li> 
+                            <li v-for="item in 9" class="el-menu-item" style="padding-left: 10px;padding-right: 10px;">
+                                <div flex="dir:left box:last">
+                                    <el-col :span="18" style="overflow: hidden; text-overflow: ellipsis;">
+                                        <i class="el-icon-tickets"></i> 
+                                        <span>羊肚菌</span>
+                                    </el-col> 
+                                    <el-col class="blue" :span="6">
+                                        <span>编辑</span> | <span>删除</span>
+                                    </el-col>
+                                </div>
+                            </li>
+                        </div>
+                    </div>
+                </div>
+          </el-col>
+          <el-col :span="18">
+                <div style="margin-top: 10px;margin-left: 20px;" class="appendInput">
+                    <el-input size="small" style="width:250px" placeholder="请输入内容" v-model="val">
+                        <el-button slot="append" icon="el-icon-search"></el-button>
+                    </el-input>
+                </div>
+                <div class="basefix app-attachment-list">
+                    <div class="app-attachment-item app-attachment-upload">
+                        <div class="app-upload" flex="main:center cross:center" style="width: 100px; height: 100px;">
+                            <i class="el-icon-upload"></i> 
+                            <input type="file" accept="image/*" multiple="multiple" style="display: none;">
+                        </div>
+                    </div>
+                    <el-tooltip class="item" effect="dark" content="Top Left 提示文字" placement="top-start">
+                        <div class="el-tooltip item app-attachment-item" >
+                            <img src="https://cdnimg.iotweixin.com/uploads/mall1285/20200422/58aac71950e2d86e6d7138484a3f7f7e.jpg" class="app-attachment-img" style="width: 100px; height: 100px;"> 
+                            <div class="app-attachment-name">微信图片_20200422125658.jpg</div>
+                        </div> 
+                    </el-tooltip>
+                    
+                </div>
+                <div>
+                    <el-pagination style="text-align:right"
+                    background
+                    :current-page="currentPage4"
+                    @current-change="handleCurrentChange"
+                    :page-size="msg.pageSize"
+                    layout="prev, pager, next,jumper"
+                    :total="total">
+                    </el-pagination>
+                </div>
+          </el-col>
+      </el-row>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" type="primary" @click="changeState = false">选定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 <script>
   export default {
     data() {
       return {
+        currentPage4:3,
+        changeState:false,
         val:'',
         addMsg:{},
         dialogVisible:false,
@@ -161,6 +230,9 @@
 
     },
     methods: {
+        openChangeDig(){
+            this.changeState=true;
+        },
         goUrl(){
             this.$router.push({
                 name: 'MembershipGrade',
@@ -185,6 +257,55 @@
 
 </script>
 <style>
+.setMember .app-attachment-name {
+    color: #666666;
+    margin-top: 5px;
+    font-size: 13px;
+    word-break: break-all;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 1;
+    overflow: hidden;
+}
+.setMember .app-attachment-item .app-attachment-img {
+    display: block;
+}
+.setMember .app-attachment-upload i {
+    font-size: 30px;
+    color: #909399;
+}
+.setMember .app-attachment-item {
+    display: inline-block;
+    cursor: pointer;
+    position: relative;
+    float: left;
+    width: 120px;
+    height: 140px;
+    margin: 7.5px;
+    text-align: center;
+    padding: 10px 10px 0;
+}
+.setMember .app-attachment-upload {
+    box-shadow: none;
+    border: 1px dashed #b2b6bd;
+    height: 100px;
+    width: 100px;
+    margin: 17.5px;
+    padding: 0;
+}
+.setMember .app-attachment-list{
+    padding: 5px;
+}
+.setMember .appendInput .el-input__inner{
+    border-right: none;
+
+}
+.setMember .appendInput .el-input-group__append{
+    background-color: #fff!important;
+    border-left: none;
+    padding: 0 15px;
+}
 .setMember .setTable .el-table__body .cell{
     display: flex;
     align-items: center;

src/components/UserMan/usersList.vue

@@ -7,16 +7,16 @@
     </div>
     <div class="content">
         <div>
-            <el-select class="w100" style="margin-right: 10px;" v-model="msg.MemberGrade" size="small" placeholder="请选择">
+            <el-select class="w100" @change="getList" style="margin-right: 10px;" v-model="msg.MemberGrade" size="small" placeholder="请选择">
                 <el-option label="全部会员" :value="0"></el-option>              
                 <el-option
-                v-for="item in options"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
+                v-for="item in memberGradeList"
+                :key="item.Id"
+                :label="item.Name"
+                :value="item.Id">
                 </el-option>
             </el-select>
-            <el-select class="w100" style="margin-right: 10px;" v-model="msg.Source" size="small" placeholder="请选择">
+            <el-select class="w100" @change="getList" style="margin-right: 10px;" v-model="msg.Source" size="small" placeholder="请选择">
                 <el-option label="全部平台" :value="0"></el-option>
                 <el-option
                 v-for="item in platList"
@@ -192,6 +192,7 @@
         },
         total:0,
         platList:[],
+        memberGradeList:[],
         
       };
     },
@@ -199,6 +200,7 @@
         this.getList();
         this.getplat();
         this.getDown();
+        this.GetMemberGradeList();
     },
     methods: {
         Export(){
@@ -240,6 +242,16 @@
                 
             })
         },
+        GetMemberGradeList(){
+            let msg={
+                Grade:0,
+                Name:'',
+                Enabled:0,
+            };
+            this.apipost("/api/user/GetMemberGradeList",{msg}, res => {
+                this.memberGradeList=res.data.data;
+            })
+        },
         getplat(){
             this.apipost("/api/user/GetMemberUserSourceEnumList",{}, res => {
                 this.platList=res.data.data;

src/plug/index.js

@@ -137,7 +137,11 @@ export default {
         var index = filename.lastIndexOf(".");
         var suffix = filename.substr(index);
         var timestamp1 = Date.parse(new Date());
-        var newFileName = '/Upload/' + path + "/" + timestamp1 + "" + suffix;
+        let str='';
+        if(this.isOnline()){
+          str="/Test"
+        }
+        var newFileName =str +'/Upload/' + path +"/"+ timestamp1 + "" + suffix;
         var uploadMsg = {
           Bucket: "viitto-1301420277",
           Region: "ap-chengdu",
@@ -160,9 +164,9 @@ export default {
         }, function (err, data) {
           if (data && data.statusCode == 200) {
             var uploadResult = {
-              resultCode: 1,
+              resultCode:1,
               FileName: fileObj.name,
-              FileUrl: "http://" + data.Location
+              FileUrl: "http://"+data.Location
             }
             if (callback) {
               callback(uploadResult);
@@ -174,121 +178,115 @@ export default {
         });
       },
       //公用跳转
-      Vue.prototype.CommonJump = function (path, obj) {
+      Vue.prototype.CommonJump = function(path,obj){
         this.$router.push({
           name: path,
           query: obj
         });
       }
 
-    //HTTP提交数据
-    Vue.prototype.apipost = function (cmd, msg, successCall, faildCall, isOnline) {
-      if (msg == null || msg == "") {
-        msg = {}
-      }
-      var apiurl = this.domainManager().DomainUrl + cmd;
-      var timestamp = (new Date()).valueOf();
-      this.apiurl = apiurl;
-      if (!localStorage.mall_userInfo && localStorage.mall_userInfo != "" && this.$route.path.toLowerCase() != "/login") {
-        this.$router.push({
-          path: '/login'
-        })
-      }
-      var token = "";
-      var key = "";
-      var MallBaseId = "0"; //小程序ID
-      var TenantId = "0"; //商户Id
-      if (this.getLocalStorage() != null) {
-        token = this.getLocalStorage().Token;
-        key = this.getLocalStorage().SecretKey;
-        MallBaseId = this.getLocalStorage().MallBaseId;
-        TenantId = this.getLocalStorage().TenantId;
-      }
-      var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
-      var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
-      let tempLanguage = 0;
-      if (localStorage.language && localStorage.language != '') {
-        if (localStorage.language == "zh-TW") {
-          tempLanguage = 1;
-        } else if (localStorage.language == "Japanese") {
-          tempLanguage = 2;
+      //HTTP提交数据
+      Vue.prototype.apipost = function (cmd, msg, successCall, faildCall, isOnline) {
+        if (msg == null || msg == "") {
+          msg = {}
         }
+        var apiurl = this.domainManager().DomainUrl + cmd;
+        var timestamp = (new Date()).valueOf();
+        this.apiurl = apiurl;
+        if (!localStorage.mall_userInfo && localStorage.mall_userInfo != "" && this.$route.path.toLowerCase() != "/login") {
+          this.$router.push({
+            path: '/login'
+          })
+        }
+        var token = "";
+        var key = "";
+        if (this.getLocalStorage() != null) {
+          token = this.getLocalStorage().Token;
+          key = this.getLocalStorage().SecretKey;
+        }
+        var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
+        var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
+        let tempLanguage = 0;
+        if (localStorage.language && localStorage.language != '') {
+          if (localStorage.language == "zh-TW") {
+            tempLanguage = 1;
+          } else if (localStorage.language == "Japanese") {
+            tempLanguage = 2;
+          }
+        }
+        var postData = {
+          "msg": msg,
+          "timestamp": timestamp,
+          "token": token,
+          "sign": md5Str,
+          "languageId": tempLanguage,
+          "cmd": cmd,
+        }
+        this.$http.post(apiurl, postData, {
+            headers: {
+              'Content-Type': 'application/json',
+              'Referer-Viitto': this.$route.path
+            }
+          })
+          .then(res => {
+            if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
+              this.$router.push({
+                path: '/login'
+              });
+            } else if (res.resultCode == 10005) {
+              this.$router.go(-1);
+            } else {
+              successCall(res);
+            }
+          }, faildCall)
       }
-      var postData = {
-        "msg": msg,
-        "timestamp": timestamp,
-        "token": token,
-        "sign": md5Str,
-        "languageId": tempLanguage,
-        "cmd": cmd,
-        "MallBaseId": MallBaseId,
-        "TenantId": TenantId
-      }
-      this.$http.post(apiurl, postData, {
-          headers: {
-            'Content-Type': 'application/json',
-            'Referer-Viitto': this.$route.path
+      Vue.prototype.JavaGetLocalFile = function(cmd, msg, fileName, successCall) {
+          var apiurl = this.domainManager().JavaLocalFileStreamDownLoadUrl + cmd;
+          var timestamp = (new Date()).valueOf();
+          if (!localStorage.mall_userInfo && localStorage.mall_userInfo != "" && this.$route.path.toLowerCase() != "/login") {
+          this.$router.push({
+          path: '/login'
+          })
           }
-        })
-        .then(res => {
-          if (res.data.resultCode == 10000 || res.data.resultCode == 10001) {
-            this.$router.push({
-              path: '/login'
-            });
-          } else if (res.resultCode == 10005) {
-            this.$router.go(-1);
-          } else {
-            successCall(res);
+          var token = "";
+          var key = "";
+          if (this.getLocalStorage() != null) {
+          token = this.getLocalStorage().Token;
+          key = this.getLocalStorage().SecretKey;
           }
-        }, faildCall)
-    }
-    Vue.prototype.JavaGetLocalFile = function (cmd, msg, fileName, successCall) {
-      var apiurl = this.domainManager().JavaLocalFileStreamDownLoadUrl + cmd;
-      var timestamp = (new Date()).valueOf();
-      if (!localStorage.mall_userInfo && localStorage.mall_userInfo != "" && this.$route.path.toLowerCase() != "/login") {
-        this.$router.push({
-          path: '/login'
-        })
-      }
-      var token = "";
-      var key = "";
-      if (this.getLocalStorage() != null) {
-        token = this.getLocalStorage().Token;
-        key = this.getLocalStorage().SecretKey;
-      }
-      let mall_userInfo = localStorage.mall_userInfo ? JSON.parse(localStorage.mall_userInfo) : '';
-      var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
-      var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
-      let tempLanguage = 0;
-      if (localStorage.language && localStorage.language != '') {
-        if (localStorage.language == "zh-TW") {
+          let mall_userInfo = localStorage.mall_userInfo ? JSON.parse(localStorage.mall_userInfo) : '';
+          var encodeMsg = encodeURIComponent(JSON.stringify(msg)).toLowerCase();
+          var md5Str = md5(`cmd=${cmd}&msg=${encodeMsg}&timestamp=${timestamp}&token=${token}&key=${key}`);
+          let tempLanguage = 0;
+          if (localStorage.language && localStorage.language != '') {
+          if (localStorage.language == "zh-TW") {
           tempLanguage = 1;
-        } else if (localStorage.language == "Japanese") {
+          } else if (localStorage.language == "Japanese") {
           tempLanguage = 2;
-        }
-      }
-      var postData = {
-        "msg": msg,
-        "timestamp": timestamp,
-        "token": token,
-        "sign": md5Str,
-        "languageId": tempLanguage,
-        "cmd": cmd,
-      }
-      this.$http.post(apiurl, postData, {
-        responseType: 'arraybuffer'
-      }).then((res) => {
-        let blob = new Blob([res.data], {
+          }
+          }
+          var postData = {
+          "msg": msg,
+          "timestamp": timestamp,
+          "token": token,
+          "sign": md5Str,
+          "languageId": tempLanguage,
+          "cmd": cmd,
+          }
+          this.$http.post(apiurl, postData, {
+          responseType: 'arraybuffer'
+          }).then((res) => {
+          let blob = new Blob([res.data], {
           type: "application/vnd.ms-excel"
-        })
-        let url = URL.createObjectURL(blob);
-        let link = document.createElement('a');
-        link.href = url;
-        link.setAttribute("download", fileName);
-        document.body.appendChild(link);
-        link.click();
-        successCall(res);
-      }).catch(function (res) {});
-    }
+          })
+          let url = URL.createObjectURL(blob);
+          let link = document.createElement('a');
+          link.href = url;
+          link.setAttribute("download", fileName);
+          document.body.appendChild(link);
+          link.click();
+          successCall(res);
+          }).catch(function(res) {});
+      }
   }
 }