Explorar o código

预约记录显示跨店用户不正确
会员管理翻页问题

Changpeng Duan %!s(int64=5) %!d(string=hai) anos
pai
achega
e0e4b79802

+ 1 - 1
pc/src/views/AcrossVip.vue

@@ -168,7 +168,7 @@
                 imageUrl: '',
                 token: {}, // 七牛云的上传地址,根据自己所在地区选择,我这里是华南区
                 domain: 'https://up-z1.qiniup.com', // 这是七牛云空间的外链默认域名
-                qiniuaddr: 'qjzpcd34v.hb-bkt.clouddn.com',
+                qiniuaddr: 'qjzpcd34v.hb-bkt.clouddn.com',//xhead.beswell.com
                 dialogVisible: false,//其他dialog
                 TakeVisible: false,//take dialog
                 dialogMemberVisible: false,//新增跨店会员dialog

+ 14 - 8
pc/src/views/Member.vue

@@ -196,7 +196,9 @@
                         width="160px"
                 >
                     <template slot-scope="scope">
-                        <el-button class="btn" type="default" size="mini" @click="editMember(scope.row)" v-if="userLevel != 4">编辑</el-button>
+                        <el-button class="btn" type="default" size="mini" @click="editMember(scope.row)"
+                                   v-if="userLevel != 4">编辑
+                        </el-button>
                         <el-button class="btn" type="danger" v-if="scope.row.UserInfo.Status == 1" size="mini"
                                    @click="pauseRow(scope.row)">
                             禁用
@@ -407,7 +409,7 @@
                 imageUrl: '',
                 token: {}, // 七牛云的上传地址,根据自己所在地区选择,我这里是华南区
                 domain: 'https://up-z1.qiniup.com', // 这是七牛云空间的外链默认域名
-                qiniuaddr: 'qjzpcd34v.hb-bkt.clouddn.com',
+                qiniuaddr: 'qjzpcd34v.hb-bkt.clouddn.com',//xhead.beswell.com
                 pullRight: true,//其他dialog
                 addDisabled: true,//禁止添加新用户
                 dialogVisible: false,//其他dialog
@@ -422,6 +424,8 @@
                 Takevalue: 0,
                 Takeoptions: [],
                 TakeHid: 0,
+                start: 0,
+                draw: 1,
                 sexOptions: [
                     {value: 1, label: '男'},//性别 1:男, 2:女
                     {value: 2, label: '女'},
@@ -507,7 +511,7 @@
             getUsrInfoList() {
 
                 // 只有新增的时候启用当前功能
-                if(this.form.btnType == 1){
+                if (this.form.btnType == 1) {
                     return false
                 }
 
@@ -544,7 +548,7 @@
                                 that.pullRight = false;
                                 that.form.name = Info.Name;
                                 that.form.height = Info.Height;
-                                that.form.weight =  parseInt(Info.Weight) / 10;
+                                that.form.weight = parseInt(Info.Weight) / 10;
                                 that.form.birthday = Info.Birthday;
                                 that.imageUrl = Info.Head;
                                 that.form.head = Info.Head;
@@ -1234,8 +1238,8 @@
                     phone: that.panel.phone,//
                     name: that.panel.name,//
                     expDay: that.panel.expDay,//
-                    start: 0,//
-                    tableMax: 9999,//
+                    start: that.start,//
+                    tableMax: 20,//
                 };
                 let postdata = qs.stringify(param);
                 VipUserListQuery(postdata).then(res => {
@@ -1244,7 +1248,7 @@
                         that.loading = false;
                         if (json.Rs) {
                             that.allTableData = json.Rs;
-                            that.recordsTotal = json.Rs.length;
+                            that.recordsTotal = json.PageCount * that.pageination.pageItem;
                         } else {
                             that.allTableData = [];
                             that.recordsTotal = 0;
@@ -1292,7 +1296,9 @@
                     this.tableData = tables;
                 }
                 that.start = index * that.draw;
-                // that.getTableQuery();
+                console.log(index);
+                console.log(that.draw);
+                that.getTableQuery();
             },
             // 过滤时间
             filterFmtDate(value, row, column) {

+ 1 - 1
pc/src/views/record.vue

@@ -124,7 +124,7 @@
                   sortable
           >
               <template slot-scope="scope">
-                  <span v-if="scope.row.Status == ''" style="color:red;">跨店</span>
+                  <span v-if="scope.row.RemainHour == ''" style="color:red;">跨店</span>
                   <span v-else style="color: #000">本店用户</span>
               </template>
           </el-table-column>

+ 1 - 1
tv/src/Global.js

@@ -390,7 +390,7 @@ numberToWeekdays = function (val) {
 
 // 随机背景
 RandomBg = function () {
-    let bgClassNum = parseInt(Math.random() * 7) + 1;
+    let bgClassNum = parseInt(Math.random() * 10) + 1;
     return 'bgStyle' + bgClassNum + '  pages';
 };
 

+ 18 - 0
tv/src/assets/css/bg.css

@@ -46,6 +46,24 @@
     background-size: 100%;
     background-repeat: no-repeat;
 }
+.bgStyle8 {
+    background-color: #028fe1;
+    background: url("../../static/img/bg/bg_8.png");
+    background-size: 100%;
+    background-repeat: no-repeat;
+}
+.bgStyle9 {
+    background-color: #028fe1;
+    background: url("../../static/img/bg/bg_9.png");
+    background-size: 100%;
+    background-repeat: no-repeat;
+}
+.bgStyle10 {
+    background-color: #028fe1;
+    background: url("../../static/img/bg/bg_10.png");
+    background-size: 100%;
+    background-repeat: no-repeat;
+}
 
 ul, li {
     list-style: none;

BIN=BIN
tv/src/static/img/bg/bg_10.png


BIN=BIN
tv/src/static/img/bg/bg_8.png


BIN=BIN
tv/src/static/img/bg/bg_9.png