Ver código fonte

Merge branch 'master' of git.huaml.com:zhh/front-end

shizhongqi 11 meses atrás
pai
commit
cc3fffddc5

+ 1 - 1
ghsApp/src/admin/home/workbench.vue

@@ -295,7 +295,7 @@ export default {
 	},
 	onShareAppMessage(res) {
 		return {
-			title: "销花宝,鲜花批发管家婆",
+			title: "销花宝",
 			desc: "",
 			imageUrl: "",
 			path: "admin/home/workbench",

+ 287 - 0
hdApp/src/admin/custom/visit.vue

@@ -0,0 +1,287 @@
+<template>
+  <div class="app-main app-content">
+    <block v-if="!$util.isEmpty(list.data)">
+      <block v-for="(item, index) in list.data" :key="index">
+        <tui-list-cell :arrow="true" @click="pageTo({url:'/pagesClient/member/detail',query: {id: item.id,},})">
+          <div class="tui-msg-box">
+            <img :src="item.avatar" class="tui-msg-pic" mode="widthFix" />
+            <div class="tui-msg-item">
+              <div class="tui-msg-name">
+                <div class="tui-user-name">
+                  {{ item.name }}
+                  <text v-if="item.level == 2" class="super-man">大客户</text>
+                </div>
+              </div>
+              <div class="tui-msg-content">
+                <span>{{ item.visitTime.substr(5,11) }}</span>
+
+                <span v-if="Number(item.remainDebtAmount) > 0" class="debt-amount">
+                  欠款<span class="amount_num">{{item.remainDebtAmount}}</span>
+                </span>
+
+                <span v-if="Number(item.remainDebtAmount) < 0" class="debt-amount">
+                  余额<span class="amount_num" style="color:#3385FF;">{{Math.abs(item.remainDebtAmount)}}</span>
+                </span>
+
+                <block v-if="item.passStatus == 1">
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 10000" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">没有下过单</text>
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 7" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1周未下单</text>
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 30" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1个月未下单</text>
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 180" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超半年未下单</text>
+                  <text v-if="item.overTimeUnExpend && item.overTimeUnExpend == 365" style="font-size:24upx;margin-left:20upx;color:green;font-weight:bold;">超1年未下单</text>
+                </block>
+                <block v-else>
+                  <text style="font-size:28upx;margin-left:20upx;color:#3385FF;font-weight:bold;">待审核</text>
+                </block>
+              </div>
+            </div>
+          </div>
+          <div class="tui-msg-right">
+            <badge-module type="danger" :dot="item.level == 3 ? true : false" v-if="item.messageNum > 0" >{{ item.messageNum }}</badge-module >
+          </div>
+        </tui-list-cell>
+      </block>
+    </block>
+    <block v-else>
+      <app-wrapper-empty :is-empty="$util.isEmpty(list.data)" title="暂无访客" />
+    </block>
+  </div>
+</template>
+
+<script>
+import TuiListCell from "@/components/plugin/list-cell";
+import BadgeModule from "@/components/plugin/badge";
+import AppWrapperEmpty from "@/components/app-wrapper-empty";
+import appVipModule from "@/components/module/app-vip";
+import AppTag from "@/components/module/app-tag.vue";
+import AppSearchModule from "@/components/module/app-search";
+import { list } from "@/mixins";
+import { getVisit } from "@/api/member";
+export default {
+  name: "customVisit",
+  components: {
+    TuiListCell,
+    BadgeModule,
+    AppWrapperEmpty,
+    appVipModule,
+    AppTag,
+    AppSearchModule
+  },
+  mixins: [list],
+  data() {
+    return {
+      tabIndex: 0
+    };
+  },
+  onPullDownRefresh() {
+    this.resetList();
+    this.getVisit().then((res) => {
+      uni.stopPullDownRefresh();
+    });
+  },
+  onReachBottom() {
+    if (!this.list.finished) {
+      this.getVisit().then((res) => {
+        uni.stopPullDownRefresh();
+      });
+    } else {
+      uni.stopPullDownRefresh();
+    }
+  },
+  onLoad(option) {},
+	onShow(){
+		uni.removeStorageSync('newClient');
+	},
+  methods: {
+    selectCurrent(item){
+
+    },
+    init() {
+      if(!this.no_shop_show_model) {
+        this.getVisit();
+      }
+    },
+    searchFn(e) {
+        this.resetList();
+        this.seekVal = e;
+        this.getVisit();
+    },
+    getVisit() {
+      return getVisit({
+        page: this.list.page
+      }).then((res) => {
+          this.completes(res);
+          if (this.$util.isEmpty(res.data)){
+            return false;
+          }
+        });
+    },
+    change(e) {
+      if (this.tabIndex == e.index) {
+        return false;
+      }
+      this.tabIndex = e.index;
+      this.resetList();
+      this.getVisit();
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.app-content {
+  padding-top: 10upx;
+  padding-bottom: 20upx;
+}
+.tabs-wrap {
+  position: fixed;
+  .tabs-left {
+    width: 80%;
+  }
+  .tabs-right {
+    width: 19%;
+    border-left: $borderColor;
+    @include disFlex(center, center);
+  }
+}
+  .input-wrap_box {
+    background-color: #fff;
+    position: fixed;
+    top: 0;
+    z-index: 10;
+    width: 100%;
+    height: 100upx;
+    display: flex;
+    align-items: center;
+    padding: 0 30upx;
+    & > view:nth-child(1) {
+      flex: 1;
+    }
+  }
+.tui-msg-box {
+  display: flex;
+  align-items: center;
+
+  .tui-msg-pic {
+    width: 80upx;
+    height: 80upx;
+    border-radius: 50%;
+    margin-right: 20upx;
+  }
+
+  .tui-msg-item {
+    max-width: 500upx;
+    min-height: 80upx;
+    overflow: hidden;
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    & > div {
+      @include disFlex(center, flex-start);
+      & > div:first-child {
+        margin-right: 8upx;
+      }
+    }
+    .level-img {
+      ::v-deep.vip-text {
+        left: 70upx;
+        top: 8upx;
+      }
+    }
+    .normal-img {
+      width: 70upx;
+      padding: 2upx 6upx;
+      color: #999;
+      background-color: #f0f2f6;
+      border-radius: 20upx;
+      .vip-text {
+        font-size: 24upx;
+        transform: scale(0.6);
+        position: relative;
+        top: -2upx;
+        left: -8upx;
+      }
+    }
+    .member-img {
+      width: 70upx;
+      padding: 2upx 6upx;
+      color: green;
+      background-color: #f0f2f6;
+      border-radius: 20upx;
+      .vip-text {
+        font-size: 24upx;
+        transform: scale(0.6);
+        position: relative;
+        top: -2upx;
+        left: -8upx;
+      }
+    }
+    .iconfont {
+      color: #00aaed;
+    }
+  }
+
+  .tui-msg-name {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    font-size: 30upx;
+    line-height: 1;
+    color: #262b3a;
+    .tui-user-name {
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      width: 290upx;
+      .super-man{
+        margin-left:20upx;
+        color:red;
+        font-size:24upx;
+        display:inline-block;
+        color:white;
+        border:1upx solid green;
+        padding:8upx 10upx;
+        background-color: green;
+        border-radius: 11upx;
+      }
+    }
+  }
+
+  .tui-msg-content {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    font-size: 24upx;
+    line-height: 1;
+    color: #9397a4;
+    .debt-amount{
+      margin-left:20upx;
+      .amount_num{
+        color:red;
+        margin-left:6upx;
+        font-weight:bold;
+      }
+    }
+  }
+}
+.tui-msg-right {
+  max-width: 120upx;
+  height: 80upx;
+  margin-left: auto;
+  margin-right: 24upx;
+  text-align: right;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.user_tag {
+  border: 1upx solid #cccccc;
+  padding: 5upx 12upx 5upx 12upx;
+  border-radius: 25upx;
+  color: #bbbbbb;
+  margin-right: 10upx;
+  margin-bottom: 12upx;
+  display: inline-block;
+  font-size: 30upx;
+}
+</style>

+ 4 - 4
hdApp/src/admin/express/create.vue

@@ -40,14 +40,14 @@
 
       <!-- 包裹信息 -->
       <view class="form-section">
-        <view class="section-title">包裹信息</view>
+        <view class="section-title">商品信息</view>
         <view class="form-item">
-          <text class="item-label">包裹数量</text>
+          <text class="item-label">商品数量</text>
           <input class="item-input" type="number" v-model="expressForm.packageNum" placeholder="请输入包裹数量" disabled />
         </view>
         <view class="form-item required">
-          <text class="item-label">重量(kg)</text>
-          <input class="item-input" type="digit" v-model="expressForm.weight" placeholder="请输入重量" />
+          <text class="item-label">商品重量</text>
+          <input class="item-input" type="digit" v-model="expressForm.weight" placeholder="公斤" />
         </view>
       </view>
 

+ 2 - 2
hdApp/src/admin/home/workbench.vue

@@ -21,7 +21,7 @@
             </view>
           </view>
           
-          <view class="today-stats">
+          <view class="today-stats" @click="pageTo({url:'/admin/custom/visit'})">
             <view class="stat-item">
               <view class="stat-content">
                 <view class="stat-label">访客</view>
@@ -1249,7 +1249,7 @@ export default {
       .item-value {
         font-size: 36upx;
         font-weight: 600;
-        color: #1b9046;
+        color: #105a2b;
         margin-bottom: 10upx;
         line-height: 1;
       }

+ 2 - 1
hdApp/src/pages.json

@@ -58,7 +58,8 @@
 				{"path": "balanceGiveChange","style": {"navigationBarTitleText": "赠送余额变动"}},
 				{"path": "debtChange","style": {"navigationBarTitleText": "欠款变动明细"}},
 				{"path": "rechargeChange","style": {"navigationBarTitleText": "充值记录"}},
-				{"path": "levelChange","style": {"navigationBarTitleText": "等级变动记录"}}
+				{"path": "levelChange","style": {"navigationBarTitleText": "等级变动记录"}},
+				{"path": "visit","style": {"navigationBarTitleText": "等级变动记录"}}
 			]
 		},
 		{

+ 2 - 12
mallApp/src/pages/member/recharge.vue

@@ -54,7 +54,7 @@
 			</view>
 
 			<!-- 充值福利提示 -->
-			<view class="welfare-tip-container" v-if="hdInfo.balance >= 0 && (rechargeWeal == 1 || rechargeWeal == 2)">
+			<view class="welfare-tip-container" v-if="hdInfo.balance >= 0 && Number(rechargeWeal)>0">
 				<view class="welfare-tip-wrap" @click="showWelfareModal">
 					<view class="tip-icon">🎁</view>
 					<view class="tip-text">充值福利</view>
@@ -74,7 +74,7 @@
 			<view class="welfare-modal-content">
 				<view class="welfare-title">充值福利</view>
 
-				<view class="welfare-list" v-if="rechargeWeal == 1">
+				<view class="welfare-list">
 					<view v-for="(item, index) in weal" :key="index" class="welfare-item" @click="selectWelfare(item)" >
 						<view class="welfare-info">
 							<view class="welfare-amount">充值{{item.recharge}}元</view>
@@ -84,16 +84,6 @@
 					</view>
 				</view>
 
-				<view class="welfare-list" v-else>
-					<view v-for="(item, index) in weal" :key="index" class="welfare-item" @click="selectWelfare(item)" >
-						<view class="welfare-info">
-							<view class="welfare-amount">充值{{item.recharge}}元</view>
-							<view class="welfare-gift">升{{ item.name }} ({{item.discount*100}}折)</view>
-						</view>
-						<view class="welfare-tag">立即充值</view>
-					</view>
-				</view>
-
 				<view class="welfare-btn-wrap">
 					<button class="welfare-cancel-btn" @click="closeWelfareModal">取消</button>
 				</view>