优化部分页面

src/assets/css/cssReset.css

@@ -71,6 +71,7 @@ input:-webkit-autofill{-webkit-box-shadow: 0 0 0px 1000px white inset;}
 .mt30{margin-top: 30px;}
 .mb30{margin-bottom: 30px;}
 .padding10{padding: 10px;}
+.paddinglr10{padding: 0 10px;}
 .tleft{text-align: left!important}
 .tright{text-align: right!important}
 .tcenter{text-align: center!important}

src/components/SalesModule/customerTransfer.vue

@@ -144,7 +144,28 @@
           <th width="7%">{{$t('salesModule.belongUnion')}}</th>
           <th width="8%">{{$t('salesModule.SuoSales')}}</th>
           <th width="8%">{{$t('salesModule.CustomerStatus')}}</th>
-          <th width="5%">{{$t('salesModule.belongUnion')}}</th>
+          <th width="5%" class="cursorpointer"  @click="changeSort(1, 'TradeMoney')">
+            <div class="sort-th">
+              <div>
+                {{$t('fnc.jiaoyie')}}
+              </div>
+              <div class="width15 ">
+                <p class=" _bold el-icon-caret-top sort-icon-top" :class="{sortActive: msg.jySort === 'asc'}" ></p>
+                <p class=" _bold el-icon-caret-bottom sort-icon-bottom" :class="{sortActive: msg.jySort === 'desc'}" ></p>
+              </div>
+            </div>
+          </th>
+          <th width="5%" class="cursorpointer"  @click="changeSort(2, 'TotalGuestNum')">
+            <div class="sort-th">
+              <div>
+                {{$t('fnc.retoushu')}}
+              </div>
+              <div class="width15 cursorpointer">
+                <p class=" _bold el-icon-caret-top sort-icon-top" :class="{sortActive: msg.rtsSort === 'asc'}"></p>
+                <p class=" _bold el-icon-caret-bottom sort-icon-bottom" :class="{sortActive: msg.rtsSort === 'desc'}"></p>
+              </div>
+            </div>
+          </th>
           <th width="5%">{{$t('salesModule.HappinessPassbook')}}</th>
           <th width="4%">优惠券</th>
           <th width="8%">{{$t('pub.pubRemark')}}</th>
@@ -177,6 +198,7 @@
           <td>{{item.EmName}}</td>
           <td>{{valueToWord(item.CustomerStatus)}}</td>
           <td>{{item.TotalPrice}}</td>
+          <td>{{item.TotalGuestNum}}</td>
           <td>{{item.CL_Balance}}</td>
           <td>
             <span style="cursor: pointer;text-decoration: underline;" @click.stop="goUrC('CouponsList',item.CustomerAccountId)">
@@ -524,6 +546,9 @@ export default {
         allDepartment:0,
         CustomerStatus:'',
         OperationStatus:'',
+        jySort: 'desc',
+        rtsSort: '',
+        orderBy: 'TradeMoney desc',
       },
       RecipientMsg: {
         CustomerIdArr: [],
@@ -634,6 +659,18 @@ export default {
     };
   },
   methods: {
+    changeSort(type, name){
+      if (type == 1) {
+        this.msg.jySort = this.msg.jySort === '' ? 'desc' : this.msg.jySort === 'desc' ? 'asc' : ''
+        this.msg.rtsSort = ''
+        this.msg.orderBy = this.msg.jySort == '' ? '' : name + ' '+ this.msg.jySort 
+      } else {
+        this.msg.jySort = ''
+        this.msg.rtsSort = this.msg.rtsSort = this.msg.rtsSort === '' ? 'desc' : this.msg.rtsSort === 'desc' ? 'asc' : ''
+        this.msg.orderBy = this.msg.rtsSort == '' ? '' : name + ' '+ this.msg.rtsSort
+      }
+      this.getList();
+    },
      getCustomerBrandList(){  // 获取品牌
             this.apipost('app_get_customer_brand',{},res=>{
                 if(res.data.resultCode==1){
@@ -1263,7 +1300,6 @@ export default {
   height: 30px;
   font-size: 12px;
   text-align: left;
-  text-indent: 25px;
 }
 .customerTransferTable tr {
   text-align: left;
@@ -1359,4 +1395,23 @@ export default {
   height: 148px;
   display: block;
 }
+.width15{
+  width: 15px;
+}
+.sort-th{
+  display: flex;
+  align-items: center;
+}
+.sortActive{
+  color: #E95252;
+}
+.sort-icon-top{
+  position: relative;
+  top: 4px;
+}
+.sort-icon-bottom{
+  position: relative;
+  bottom: 4px;
+}
+
 </style>

src/components/activity/OrderManagement.vue

@@ -49,6 +49,7 @@
         <th>订单状态</th>
         <th>订单总价</th>
         <th>订单生成时间</th>
+        <th>收货地址</th>
         <th>配送备注</th>
         <th>关联销售</th>
         <th>操作</th>
@@ -58,7 +59,7 @@
           <td>{{item.orderNum}}</td>
           <td>{{item.goodsName}}</td>
           <td>
-              <img class="OrderMgoodImg" :src="item.goodsImg" alt=""/>
+            <img @click="showImg(item.goodsImg)" class="OrderMgoodImg cursorpointer" :src="item.goodsImg" alt=""/>
           </td>
           <td>{{item.goodsPrice}}</td>
           <td>{{item.buyNum}}</td>
@@ -73,6 +74,10 @@
            <td>
               {{getDate(item.crateTime)}}
           </td>
+          <td class="paddinglr10">
+            <p class="tleft">联系电话： {{item.customerPhone}}</p>
+            <p class="tleft">收货地址： {{item.customerAddress}}</p>
+          </td>
           <td>{{item.sendRemark}}</td>
           <td>{{item.saleName}}</td>
           <td>
@@ -86,6 +91,9 @@
       <i class="iconfont icon-kong"></i>
       <p>{{$t("active.ld_noData")}}</p>
     </div>
+    <viewer :images="images" :options="imageOptions" @inited="inited" class="viewer" ref="viewer">
+      <img v-for="src in images" :src="src" :key="src">
+    </viewer>
 </div>
 </template>
 <script>
@@ -93,7 +101,11 @@ import moment from 'moment'
 export default {
   data() {
     return {
-      //请求
+       imageOptions: {
+        navbar: false,
+        title: false
+      },
+      images: [],
       msg: {
         orderStatus:'',
         orderNum:'',
@@ -115,6 +127,21 @@ export default {
   },
 
   methods: {
+    showImg: function(src) {
+      let isExsit = false;
+      this.images.forEach(x => {
+        if (x === src) isExsit = true;
+      });
+      if (!isExsit) {
+        this.images.push(src);
+      } else {
+        this.$viewer.view(this.images.indexOf(src));
+      }
+      this.$viewer.show();
+    },
+    inited(viewer) {
+      this.$viewer = viewer;
+    },
     handleCurrentChange(val){
       this.msg.pageIndex=val;
       this.getList();

src/components/activity/pushManagement.vue

 <style>
+.pushManagement .el-checkbox{
+  margin-left: 0;
+  margin-right: 30px;
+}
 </style>
 
 <template>
@@ -132,6 +136,13 @@
           -
           <el-input type="number" v-model="addMsg.MaxCoupons" class="w100"></el-input>
         </el-form-item>
+        <el-form-item label="提示内容">
+          <el-checkbox-group v-model="addMsg.ISShowList">
+            <el-checkbox :label="1">幸福存折</el-checkbox>
+            <el-checkbox :label="2">优惠券</el-checkbox>
+            <el-checkbox :label="3">大红包</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <button
@@ -185,6 +196,7 @@ export default {
         MaxCoupons: 0,
         MinPassbook: 0,
         MaxPassbook: 0,
+        ISShowList: [],
       },
       rules: {
         SendTitle: [
@@ -318,6 +330,7 @@ export default {
         MaxCoupons: 0,
         MinPassbook: 0,
         MaxPassbook: 0,
+        ISShowList: [],
       };
       this.addMsg = newMsg;
     },