客户列表优化

ghsApp/src/components/plugin/modal.vue

@@ -1,6 +1,6 @@
 <template>
 	<view @touchmove.stop.prevent>
-		<view class="tui-modal-box" style="margin-top: -150rpx" :style="{padding:padding,borderRadius:radius,background:bgcolor}" :class="[(fadein || show)?'tui-modal-normal':'tui-modal-scale',show?'tui-modal-show':'']">
+		<view class="tui-modal-box" :style="{padding:padding,borderRadius:radius,background:bgcolor}" :class="[(fadein || show)?'tui-modal-normal':'tui-modal-scale',show?'tui-modal-show':'']">
 			<view v-if="!custom">
 				<view class="tui-modal-title" v-if="title">{{title}}</view>
 				<!-- <view class="tui-modal-content" :class="[title?'':'tui-mtop']"> -->

ghsApp/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'ghs'
-export const APIHOST = 'https://api.shop.hzghd.com'
-export const IMGHOST = 'https://img.hzghd.com'
+export const APIHOST = 'http://api.shop.hzghd.com'
+export const IMGHOST = 'http://img.hzghd.com'
 export const CURRENT_ENV = 'dev'

ghsApp/src/ext.json

@@ -4,9 +4,9 @@
   "directCommit": false,
   "ext": {
     "account": 12362,
-    "apiHost": "https://api.shop.hzghd.com",
+    "apiHost": "http://api.shop.hzghd.com",
     "socketApiHost": "api.shop.hzghd.com",
-    "imgHost": "https://img.hzghd.com",
+    "imgHost": "http://img.hzghd.com",
     "name":"花掌柜"
   }
 }

ghsApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('http://api.shop.hzghd.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {

hdApp/src/admin/home/member.vue

@@ -5,12 +5,12 @@
       <view>
         <AppSearchModule placeholder="这里搜索" @input="searchFn"/>
       </view>
-      <view style="padding:0 10upx 0 10upx;" >
-				<button class="admin-button-com middle blue" @click="addCustom()">添加</button>
+      <view style="padding:0 0upx 0 10upx;" >
+				<button class="admin-button-com middle blue" @click="addCustom()">添加客户</button>
 			</view>
     </view>
     <view class="app-tabs">
-      <app-tabs :tabs="tabs" :isFixed="false" :top="50" :currentTab="tabIndex" :height="100" @change="change" itemWidth="33%" :isAdd="false" />
+      <app-tabs :tabs="tabs" :isFixed="false" :top="50" :currentTab="tabIndex" :height="100" @change="change" itemWidth="25%" :isAdd="false" />
     </view>
 
     <view class="list-wrap">
@@ -79,17 +79,26 @@ export default {
       tabs: [
         {
           name: "全部",
-          value: 0
+          value: 0,
+          type:0
         },
         {
-          name: "消费排行",
-          value: 0
+          name: "余额",
+          value: 0,
+          type:2
         },
         {
-          name: "赊账排行",
-          value: 0
+          name: "消费",
+          value: 0,
+          type:1
         },
-      ]
+        {
+          name: "生日",
+          value: 0,
+          type:3
+        }
+      ],
+      customType:0
     };
   },
   onPullDownRefresh() {
@@ -115,6 +124,8 @@ export default {
         return false;
       }
       this.tabIndex = e.index;
+      let tab = this.tabs[this.tabIndex]
+      this.customType = tab.type
       this.resetList();
       this.getMyCustomList();
     },
@@ -135,7 +146,7 @@ export default {
       this.getMyCustomList()
     },
     getMyCustomList() {
-      return getList({ search:"", page:this.list.page,type:this.tabIndex,name: this.seekVal }).then(res => {
+      return getList({ search:"", page:this.list.page,type:this.customType,name: this.seekVal }).then(res => {
         if(res.code == 1){
           this.completes(res)
         }
@@ -149,14 +160,14 @@ export default {
   padding-top: 100upx;
   padding-bottom: 20upx;
 }
-  .list-wrap {
-    padding-top: 100upx;
-    
-    .list {
-      background-color: #fff;
-      margin-bottom: 20upx;
-    }
+.list-wrap {
+  padding-top: 100upx;
+  
+  .list {
+    background-color: #fff;
+    margin-bottom: 20upx;
   }
+}
 .app-tabs {
     position: fixed;
     @media screen and (max-width: 1100px) {
@@ -175,138 +186,131 @@ export default {
     @include disFlex(center, center);
   }
 }
-  .input-wrap_box {
-    background-color: #fff;
-    position: fixed;
-    top: 0;
-    z-index: 10;
-    /* 手机mobile屏幕小于1000px */
-    @media screen and (max-width: 1100px) {
-      width: 100%;
-    }
-    /* 收银台cashier屏幕大于1000px */
-    @media screen and (min-width:1100px) {
-      width: 40%;
-    }   
-    height: 100upx;
-    display: flex;
-    align-items: center;
-    padding: 0 30upx;
-    & > view:nth-child(1) {
-      flex: 1;
-    }
+.input-wrap_box {
+  background-color: #fff;
+  position: fixed;
+  top: 0;
+  z-index: 10;
+  width: 100%;    
+  height: 100upx;
+  display: flex;
+  align-items: center;
+  padding: 0 10upx;
+  & > view:nth-child(1) {
+    flex: 1;
   }
+}
 
- .user-card {
-   display: flex;
-   align-items: center;
-   padding: 12upx 0;
-   width: 100%;
-   position: relative;
+.user-card {
+  display: flex;
+  align-items: center;
+  padding: 12upx 0;
+  width: 100%;
+  position: relative;
 
-   .user-avatar {
-     width: 80upx;
-     height: 80upx;
-     border-radius: 50%;
-     overflow: hidden;
-     margin-left: 16upx;
-     margin-right: 16upx;
+  .user-avatar {
+    width: 80upx;
+    height: 80upx;
+    border-radius: 50%;
+    overflow: hidden;
+    margin-left: 16upx;
+    margin-right: 16upx;
 
-     .avatar-img {
-       width: 100%;
-       height: 100%;
-     }
-   }
+    .avatar-img {
+      width: 100%;
+      height: 100%;
+    }
+  }
 
-   .user-info {
-     flex: 1;
-     display: flex;
-     flex-direction: column;
-     justify-content: space-between;
-     height: 80upx;
-     padding-right: 210upx;
-   }
+  .user-info {
+    flex: 1;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    height: 80upx;
+    padding-right: 210upx;
+  }
 
-   .user-main {
-     display: flex;
-     align-items: flex-start;
-     margin-bottom: 4upx;
-     width: 100%;
-   }
+  .user-main {
+    display: flex;
+    align-items: flex-start;
+    margin-bottom: 4upx;
+    width: 100%;
+  }
 
-   .user-name {
-     flex: 1;
-     font-size: 28upx;
-     font-weight: bold;
-     color: #333;
-     overflow: hidden;
-     text-overflow: ellipsis;
-     white-space: nowrap;
-     margin-right: 10upx;
-     max-width: calc(100% - 160upx);
-   }
+  .user-name {
+    flex: 1;
+    font-size: 28upx;
+    font-weight: bold;
+    color: #333;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    margin-right: 10upx;
+    max-width: calc(100% - 160upx);
+  }
 
-   .right-info {
-     position: absolute;
-     right: 50upx;
-     top: 12upx;
-     display: flex;
-     flex-direction: column;
-     align-items: flex-end;
-     gap: 4upx;
-     width: 200upx;
-     z-index: 1;
-     text-align: right;
-   }
+  .right-info {
+    position: absolute;
+    right: 50upx;
+    top: 12upx;
+    display: flex;
+    flex-direction: column;
+    align-items: flex-end;
+    gap: 4upx;
+    width: 200upx;
+    z-index: 1;
+    text-align: right;
+  }
 
-   .user-balance {
-     display: flex;
-     align-items: baseline;
-     white-space: nowrap;
-     width: 100%;
-     justify-content: flex-end;
-   }
+  .user-balance {
+    display: flex;
+    align-items: baseline;
+    white-space: nowrap;
+    width: 100%;
+    justify-content: flex-end;
+  }
 
-   .balance {
-     font-size: 26upx;
-     font-weight: bold;
-     text-align: right;
-   }
+  .balance {
+    font-size: 26upx;
+    font-weight: bold;
+    text-align: right;
+  }
 
-   .positive {
-     color: #049E2C;
-   }
+  .positive {
+    color: #049E2C;
+  }
 
-   .negative {
-     color: #ff0000;
-   }
+  .negative {
+    color: #ff0000;
+  }
 
-   .user-meta {
-     display: flex;
-     align-items: center;
-     font-size: 22upx;
-     color: #9397a4;
-   }
+  .user-meta {
+    display: flex;
+    align-items: center;
+    font-size: 22upx;
+    color: #9397a4;
+  }
 
-   .visit-time {
-     overflow: hidden;
-     text-overflow: ellipsis;
-     white-space: nowrap;
-   }
+  .visit-time {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
 
-   .member-badge {
-     background: linear-gradient(135deg, #049E2C, #06c235);
-     color: #ffffff;
-     padding: 6upx 16upx;
-     border-radius: 18upx;
-     font-size: 24upx;
-     font-weight: bold;
-     box-shadow: 0 2upx 8upx rgba(4, 158, 44, 0.25);
-     border: 1upx solid rgba(255, 255, 255, 0.3);
-     white-space: nowrap;
-     flex-shrink: 0;
-     letter-spacing: 1px;
-   }
+  .member-badge {
+    background: linear-gradient(135deg, #049E2C, #06c235);
+    color: #ffffff;
+    padding: 6upx 16upx;
+    border-radius: 18upx;
+    font-size: 24upx;
+    font-weight: bold;
+    box-shadow: 0 2upx 8upx rgba(4, 158, 44, 0.25);
+    border: 1upx solid rgba(255, 255, 255, 0.3);
+    white-space: nowrap;
+    flex-shrink: 0;
+    letter-spacing: 1px;
+  }
 }
 
 // 确保箭头正常显示

hdApp/src/config.js

@@ -1,5 +1,5 @@
 export const ProjectName = 'hd'
-export const APIHOST = 'https://api.shop.huaml.com'
-export const FORMALHOST = 'https://shop.huaml.com'
-export const IMGHOST = 'https://img.huaml.com'
+export const APIHOST = 'http://api.shop.huaml.com'
+export const FORMALHOST = 'http://shop.huaml.com'
+export const IMGHOST = 'http://img.huaml.com'
 export const CURRENT_ENV = 'dev'

hdApp/src/ext.json

@@ -4,9 +4,9 @@
   "directCommit": false,
   "ext": {
     "account": 12362,
-    "apiHost": "https://api.shop.huaml.com",
+    "apiHost": "http://api.shop.huaml.com",
     "socketApiHost": "api.shop.huaml.com",
-    "imgHost": "https://img.huaml.com",
+    "imgHost": "http://img.huaml.com",
     "name":"花美玲"
   }
 }

hdApp/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {

hdPad/src/config.js

@@ -1,4 +1,4 @@
 export const ProjectName = 'hd'
-export const APIHOST = 'https://api.shop.huaml.com'
-export const IMGHOST = 'https://img.huaml.com'
+export const APIHOST = 'http://api.shop.huaml.com'
+export const IMGHOST = 'http://img.huaml.com'
 export const CURRENT_ENV = 'dev'

hdPad/src/ext.json

@@ -4,9 +4,9 @@
   "directCommit": false,
   "ext": {
     "account": 12362,
-    "apiHost": "https://api.shop.huaml.com",
+    "apiHost": "http://api.shop.huaml.com",
     "socketApiHost": "api.shop.huaml.com",
-    "imgHost": "https://img.huaml.com",
+    "imgHost": "http://img.huaml.com",
     "name":"花美玲"
   }
 }

hdPad/src/pages/home/components/customInfo.vue

@@ -6,81 +6,83 @@
     </view>
     <view class="custom-detail">
       <view class="info-card">
+
         <view class="info-item">
           <text class="label">名称</text>
           <view class="value-container">
-            <text class="value">{{customInfo.name || '龙岩花紫柜'}}</text>
+            <text class="value">{{customInfo.name || ''}}</text>
           </view>
         </view>
-        
+
         <view class="info-item">
           <text class="label">手机号</text>
-          <text class="value">{{customInfo.mobile || '15280215347'}}</text>
+          <text class="value">{{customInfo.mobile || ''}}</text>
         </view>
-        
+
         <view class="info-item">
           <text class="label">地址</text>
           <view class="value-container">
-            <text class="value">{{customInfo.address || '厦门市 前山路147号521'}}</text>
+            <text class="value">{{customInfo.address || ''}}</text>
           </view>
         </view>
-        
+
         <view class="info-item">
           <text class="label">生日</text>
           <view class="value-container">
-            <text class="value">{{customInfo.birthday || '12月3日'}}</text>
+            <text class="value">{{customInfo.birthday || ''}}</text>
           </view>
         </view>
-        
+
         <view class="info-item">
           <text class="label">余额</text>
-          <text class="value highlight">{{customInfo.balance || '136'}}</text>
+          <text class="value highlight">{{customInfo.balance || '0'}}</text>
         </view>
-        
+
         <view class="info-item">
           <text class="label">等级</text>
-          <text class="value">{{customInfo.level || '白银'}}</text>
+          <text class="value">{{customInfo.level || ''}}</text>
         </view>
-        
+
         <view class="info-item">
           <text class="label">累计消费</text>
-          <text class="value">{{customInfo.totalConsumption || '136'}}</text>
+          <text class="value">{{customInfo.totalConsumption || ''}}</text>
         </view>
-        
+
         <view class="info-item action-item" @tap="goDebtOrder()">
           <text class="label">挂账订单</text>
           <text class="arrow">></text>
         </view>
-        
+
         <view class="info-item action-item" @tap="goSettle()">
           <text class="label">结账记录</text>
           <text class="arrow">></text>
         </view>
-        
+
         <view class="info-item action-item" @tap="goBalance()">
           <text class="label">余额变动</text>
           <text class="arrow">></text>
         </view>
-        
+
         <view class="info-item action-item" @tap="goRecharge()">
           <text class="label">充值记录</text>
           <text class="arrow">></text>
         </view>
-        
+
         <view class="info-item action-item" @tap="goOrder()">
           <text class="label">下单记录</text>
           <text class="arrow">></text>
         </view>
-        
+
         <view class="info-item action-item" @tap="goLevel()">
           <text class="label">等级变动</text>
           <text class="arrow">></text>
         </view>
-        
+
         <view class="info-item action-item" @tap="goDebt()">
           <text class="label">欠款变动</text>
           <text class="arrow">></text>
         </view>
+
       </view>
     </view>
   </view>
@@ -96,7 +98,7 @@ export default {
   data() {
     return {
       customInfo: {},
-      currentJobType: 'modify',
+      currentJobType: 'customInfo',
       currentJobId: 0,
       editMode: false,
       editField: ''

hdPad/src/pages/home/components/customList.vue

@@ -2,9 +2,10 @@
     <view class="itemList-box">
         <view class="title">列表</view>
         <view class="order-status">
-            <view @tap="changeStatus(0)" :class="[{'checked':status===0}]">全部</view>
-            <view @tap="changeStatus(1)" :class="[{'checked':status===4}]">余额排行</view>
-            <view @tap="changeStatus(4)" :class="[{'checked':status===1}]">消费排行</view>
+            <view @tap="changeType(0)" :class="[{'checked':type===0}]">全部</view>
+            <view @tap="changeType(2)" :class="[{'checked':type===2}]">余额</view>
+            <view @tap="changeType(1)" :class="[{'checked':type===1}]">消费</view>
+            <view @tap="changeType(3)" :class="[{'checked':type===3}]">生日</view>
         </view>
 
         <view class="search-container">
@@ -78,7 +79,7 @@ export default {
     data(){
         return {
             groupList:[],
-            status:0,
+            type:0,
             selCustomId:0,
             sn:'',
             searchKeyword: '',
@@ -95,8 +96,8 @@ export default {
         onRestore(){
             console.log('onRestore')
         },
-        changeStatus(status){
-            this.status = status
+        changeType(type){
+            this.type = type
             this.resetList()
             this.getCustomData()
         },
@@ -123,23 +124,16 @@ export default {
             }
         },
         getCustomData(){
-            let params = {
-                page: this.list.page,
-                pageSize: 30
-            }
-            
+            let params = {page:this.list.page,pageSize:20,type:this.type}
             if (this.searchKeyword) {
                 params.keyword = this.searchKeyword
             }
-            
             return getCustomList(params).then(res=>{
                 if(res.code == 1){
                     this.completes(res)
-
                     if(this.list.data && this.list.data[0]){
                         this.getCustomInfo(this.list.data[0])
                     }
-
                 }
             })
         },

hdPad/src/static/iconfont/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'iconfont';  /* project id 1525256 */
-  src: url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
-  src: url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
-  url('https://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
+  src: url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot');
+  src: url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.eot?#iefix') format('embedded-opentype'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff2') format('woff2'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.woff') format('woff'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.ttf') format('truetype'),
+  url('http://api.shop.huaml.com/iconfont/font_1525256_6bxwphhntqh.svg#iconfont') format('svg');
 }
 
 .iconfont {