shish %!s(int64=5) %!d(string=hai) anos
pai
achega
286d2d942d

+ 3 - 0
ghsApp/src/admin/home/apply.vue

@@ -107,6 +107,9 @@
                     }
                 ]
             }
+        },
+        onPullDownRefresh() {
+            uni.stopPullDownRefresh();
         }
     }
 </script>

+ 353 - 324
ghsApp/src/admin/home/me.vue

@@ -1,344 +1,373 @@
 <template>
-    <view class="me-content_box app-content">
-        <image :src="`${constant.imgUrl}/ghs/me/bg.png`" class="me-content_bg"></image>
-        <template v-if="!$util.isEmpty(infoData)">
-            <view class="me-user_box">
-                <view class="user-info_item">
-                    <view>
-                        <view class="name">
-                            {{infoData.adminName}}
-                        </view>
-                        <view class="mobile">
-                            {{infoData.adminMobile}}
-                        </view>
-                    </view>
-                    <!-- <i class="iconfont iconxiangyou"></i> -->
-                </view>
+  <view class="me-content_box app-content">
+    <image
+      :src="`${constant.imgUrl}/ghs/me/bg.png`"
+      class="me-content_bg"
+    ></image>
+    <template v-if="!$util.isEmpty(infoData)">
+      <view class="me-user_box">
+        <view class="user-info_item">
+          <view>
+            <view class="name">
+              {{ infoData.adminName }}
             </view>
-            <view class="me-shop_box">
-                <view class="me-shop_content content_box">
-                    <view class="me-shop_top">
-                        <view class="shop-top_left">
-                            <app-avatar-module :src="infoData.shopImg" :width="100"/> 
-                            <view class="top-info_box">
-                                    <view >
-                                        {{infoData.sjName}}
-                                    </view>
-                                    <view>
-                                        {{infoData.shopName}}
-                                    </view>
-                            </view>
-                        </view>
-                        <button 
-                            v-if="loginInfo.super"
-                            @click="shopShow"
-                            class="admin-button-com default chang-shop_btn">
-                            <i class="iconfont iconqiehuan1"></i>
-                            切换店铺
-                        </button>
-                         <!-- <view 
-                            v-if="loginInfo.super"
-                            class="chang-shop_btn">
-                            切换店铺
-                        </view> -->
-                    </view>
-                    <view 
-                        @click=" pageTo({
-                            url: '/pagesClient/official/index',
-                            type:2
-                        })"
-                        class="image-box">
-                        <view class="dec">
-                            店铺服务期至: {{infoData.deadline}}
-                        </view>
-                        <image :src="`${constant.imgUrl}/ghs/me/upgrade.png`"></image>
-                    </view>
-                
-                </view>
-                <view class="account-info_box content_box">
-                    <view class="info-lf_box">
-                        <view>
-                            账户余额(元)
-                        </view>
-                        <view>
-                        <text>¥ </text> {{infoData.balance}}
-                        </view>
-                        <view>
-                            可提现余额 ¥ {{infoData.txBalance}} 
-                            <text v-if="infoData.txBalance > 0" @click="checkToApplyCash" class="to-cash">提现</text>
-                        </view>
-                    </view>
-                    <button @click="pageTo({url:'/pagesStore/me/recharge'})" class="admin-button-com default" >充值</button>
+            <view class="mobile">
+              {{ infoData.adminMobile }}
+            </view>
+          </view>
+          <!-- <i class="iconfont iconxiangyou"></i> -->
+        </view>
+      </view>
+      <view class="me-shop_box">
+        <view class="me-shop_content content_box">
+          <view class="me-shop_top">
+            <view class="shop-top_left">
+              <app-avatar-module :src="infoData.shopImg" :width="100" />
+              <view class="top-info_box">
+                <view>
+                  {{ infoData.sjName }}
                 </view>
-                <view class="module-com content_box user-open_bx">
-                    <view class="input-line-wrap">
-                        <tui-list-cell @click="pageTo({url:'/pagesStore/me/withdraw'})" class="line-cell" :hover="false" :arrow="true">
-                            <div class="tui-title">提现记录</div>
-                        </tui-list-cell>
-                        <tui-list-cell @click="pageTo({url:'/pagesStore/me/incomeExpenses'})" class="line-cell" :hover="false" :arrow="true">
-                            <div class="tui-title">收支明细</div>
-                        </tui-list-cell>
-                        <tui-list-cell @click="pageTo({url:'/pagesStore/me/rechargeList'})" class="line-cell" :hover="false" :arrow="true">
-                            <div class="tui-title">充值记录</div>
-                        </tui-list-cell>
-                        <tui-list-cell @click="pageTo({url:'/pagesStore/me/cashSet'})" class="line-cell" :hover="false" :arrow="true">
-                            <div class="tui-title">提现帐号设置</div>
-                        </tui-list-cell>
-                    </view>
+                <view>
+                  {{ infoData.shopName }}
                 </view>
+              </view>
             </view>
-        </template>
-        <DorpdownSelect 
-        ref="dorpdownSelect"
-        :menuObj.sync="menuObj"  
-        top="0px"
-        :isShowTit="false"
-        :selectItemId.sync="shopId"
-        @selectSussess="selectSussess"></DorpdownSelect>
-</view>
+            <button
+              v-if="loginInfo.super"
+              @click="shopShow"
+              class="admin-button-com default chang-shop_btn"
+            >
+              <i class="iconfont iconqiehuan1"></i>
+              切换店铺
+            </button>
+          </view>
+          <view
+            @click="
+              pageTo({
+                url: '/pagesClient/official/index',
+                type: 2,
+              })
+            "
+            class="image-box"
+          >
+            <view class="dec"> 店铺服务期至: {{ infoData.deadline }} </view>
+            <image :src="`${constant.imgUrl}/ghs/me/upgrade.png`"></image>
+          </view>
+        </view>
+        <view class="account-info_box content_box">
+          <view class="info-lf_box">
+            <view> 账户余额(元) </view>
+            <view> <text>¥ </text> {{ infoData.balance }} </view>
+            <view>
+              可提现余额 ¥ {{ infoData.txBalance }}
+              <text
+                v-if="infoData.txBalance > 0"
+                @click="checkToApplyCash"
+                class="to-cash"
+                >提现</text
+              >
+            </view>
+          </view>
+          <button
+            @click="pageTo({ url: '/pagesStore/me/recharge' })"
+            class="admin-button-com default"
+          >
+            充值
+          </button>
+        </view>
+        <view class="module-com content_box user-open_bx">
+          <view class="input-line-wrap">
+            <tui-list-cell
+              @click="pageTo({ url: '/pagesStore/me/withdraw' })"
+              class="line-cell"
+              :hover="false"
+              :arrow="true"
+            >
+              <div class="tui-title">提现记录</div>
+            </tui-list-cell>
+            <tui-list-cell
+              @click="pageTo({ url: '/pagesStore/me/incomeExpenses' })"
+              class="line-cell"
+              :hover="false"
+              :arrow="true"
+            >
+              <div class="tui-title">收支明细</div>
+            </tui-list-cell>
+            <tui-list-cell
+              @click="pageTo({ url: '/pagesStore/me/rechargeList' })"
+              class="line-cell"
+              :hover="false"
+              :arrow="true"
+            >
+              <div class="tui-title">充值记录</div>
+            </tui-list-cell>
+            <tui-list-cell
+              @click="pageTo({ url: '/pagesStore/me/cashSet' })"
+              class="line-cell"
+              :hover="false"
+              :arrow="true"
+            >
+              <div class="tui-title">提现帐号设置</div>
+            </tui-list-cell>
+          </view>
+        </view>
+      </view>
+    </template>
+    <DorpdownSelect
+      ref="dorpdownSelect"
+      :menuObj.sync="menuObj"
+      top="0px"
+      :isShowTit="false"
+      :selectItemId.sync="shopId"
+      @selectSussess="selectSussess"
+    ></DorpdownSelect>
+  </view>
 </template>
 
 <script>
-    import AppAvatarModule from '@/components/module/app-avatar'
-    import TuiListCell from '@/components/plugin/list-cell'
-    import { mainMy,applyCash } from '@/api/home'
-    import { toggleShop } from '@/api/common'
-    import DorpdownSelect from "@/components/module/dorpdownSelect";
-    import { selectShop } from '@/mixins'
-    import { getUser } from '@/utils/auth'
-    import { mapGetters } from 'vuex'
-    export default { // 我的
-        name:"Me",
-        components:{
-            AppAvatarModule,
-            TuiListCell,
-            DorpdownSelect
-        },
-        mixins:[selectShop],
-        computed: {
-		...mapGetters(["getLoginInfo"])
-	},
-        data(){
-            return {
-                constant: this.$constant,
-                infoData: {}
-            }
-        },
-        methods:{
-            shopShow(){
-                this.shopId = this.getLoginInfo.shopId
-                this.$refs.dorpdownSelect.dropdownShow = true;
-            },
-           async init(){
-                try {
-                    const { data } = await mainMy()
-                    this.infoData = data
-                } finally {
-
-                }
-            },
-            async selectSussess(){
-                uni.showLoading({
-                    title: '加载中'
-                });
-              try {
-                  let {data} = await toggleShop({ shopId:this.shopId});
-                  this.$store.commit('setLoginInfo', {
-                        ...this.getLoginInfo,
-                        shopId: data.shopId, // 门店id
-                        shopAdminId: data.id //员工id
-					})
-                  getUser(true)
-                  this.init()
-              } finally {
-                 uni.hideLoading(); 
-              }
-            },
-            checkToApplyCash(){
-                let self = this;
-                //没有设置提现帐号则提示
-                if(self.infoData.cashAccount == ''){
-                    uni.showModal({
-                        title: '提示',
-                        content: '您还没有设置提现帐号',
-                        confirmText: "去设置",
-                        success: function (res) {
-                            if (res.confirm) {
-                                self.$util.pageTo({url: "/pagesStore/me/cashSet"})
-                            }
-                        }
-                    });
-                }else{
-                    self.applyCash()
-                }
-            },
-           async applyCash(){
-                uni.showLoading({
-                    title: '加载中'
-                }); 
-               try {
-                   const { data } = await applyCash({})
-                   uni.showToast({
-                    title: '提现成功',
-                    duration: 2000
-                });
-               }finally {
-                 uni.hideLoading(); 
-              }
+import AppAvatarModule from "@/components/module/app-avatar";
+import TuiListCell from "@/components/plugin/list-cell";
+import { mainMy, applyCash } from "@/api/home";
+import { toggleShop } from "@/api/common";
+import DorpdownSelect from "@/components/module/dorpdownSelect";
+import { selectShop } from "@/mixins";
+import { getUser } from "@/utils/auth";
+import { list } from "@/mixins";
+import { mapGetters } from "vuex";
+export default {
+  // 我的
+  name: "Me",
+  components: {
+    AppAvatarModule,
+    TuiListCell,
+    DorpdownSelect,
+  },
+  mixins: [selectShop, list],
+  computed: {
+    ...mapGetters(["getLoginInfo"]),
+  },
+  data() {
+    return {
+      constant: this.$constant,
+      infoData: {},
+    };
+  },
+  onPullDownRefresh() {
+        uni.stopPullDownRefresh();
+  },
+  methods: {
+    shopShow() {
+      this.shopId = this.getLoginInfo.shopId;
+      this.$refs.dorpdownSelect.dropdownShow = true;
+    },
+    async init() {
+      try {
+        const { data } = await mainMy();
+        this.infoData = data;
+      } finally {
+      }
+    },
+    async selectSussess() {
+      uni.showLoading({
+        title: "加载中",
+      });
+      try {
+        let { data } = await toggleShop({ shopId: this.shopId });
+        this.$store.commit("setLoginInfo", {
+          ...this.getLoginInfo,
+          shopId: data.shopId, // 门店id
+          shopAdminId: data.id, //员工id
+        });
+        getUser(true);
+        this.init();
+      } finally {
+        uni.hideLoading();
+      }
+    },
+    checkToApplyCash() {
+      let self = this;
+      //没有设置提现帐号则提示
+      if (self.infoData.cashAccount == "") {
+        uni.showModal({
+          title: "提示",
+          content: "您还没有设置提现帐号",
+          confirmText: "去设置",
+          success: function (res) {
+            if (res.confirm) {
+              self.$util.pageTo({ url: "/pagesStore/me/cashSet" });
             }
-        }
-    }
+          },
+        });
+      } else {
+        self.applyCash();
+      }
+    },
+    async applyCash() {
+      uni.showLoading({
+        title: "加载中",
+      });
+      try {
+        const { data } = await applyCash({});
+        uni.showToast({
+          title: "提现成功",
+          duration: 2000,
+        });
+      } finally {
+        uni.hideLoading();
+      }
+    },
+    _list() {},
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-    .me-content_box {
-        position: relative;
-        .content_box {
-            background-color: #FFFFFF;
-            box-shadow: 0px 1px 0px 0px #EEEEEE;
-            border-radius: 10px; 
+.me-content_box {
+  position: relative;
+  .content_box {
+    background-color: #ffffff;
+    box-shadow: 0px 1px 0px 0px #eeeeee;
+    border-radius: 10px;
+  }
+  & .me-content_bg {
+    position: absolute;
+    top: 0;
+    width: 102%;
+    height: 410upx;
+  }
+  & .me-user_box {
+    position: relative;
+    padding: 150upx 30upx 0;
+    z-index: 10;
+    & > .user-info_item {
+      display: flex;
+      align-items: center;
+      & > view:nth-child(1) {
+        flex: 1;
+        & > view {
+          color: #ffffff;
+          font-weight: 600;
+          &.name {
+            font-size: 36upx;
+            margin-bottom: 20px;
+          }
+          &.mobile {
+            font-size: 26upx;
+          }
         }
-        & .me-content_bg {
-            position: absolute;
-            top: 0;
-            width: 102%;
-            height: 410upx;
-        }
-        & .me-user_box {
-            position: relative;
-            padding: 150upx 30upx 0;
-            z-index: 10;
-            & > .user-info_item {
-                display: flex;
-                align-items: center;
-                 & > view:nth-child(1) {
-                     flex: 1;
-                     & > view {
-                        color: #FFFFFF;
-                        font-weight: 600;
-                        &.name {
-                           font-size: 36upx;
-                           margin-bottom: 20px;
-                        }
-                        &.mobile {
-                            font-size: 26upx;
-                        }
-                     }
-                }
-                & .iconxiangyou {
-                    font-size: 20upx;
-                    color: #FFFFFF;
-                }
+      }
+      & .iconxiangyou {
+        font-size: 20upx;
+        color: #ffffff;
+      }
+    }
+  }
+  & .me-shop_box {
+    padding: 50upx 20px 0;
+    & .me-shop_content {
+      position: relative;
+      z-index: 10;
+      & .me-shop_top {
+        position: relative;
+        & .shop-top_left {
+          display: flex;
+          padding: 40upx 30upx;
+          align-items: center;
+          & .top-info_box {
+            padding-left: 30upx;
+            & > view:nth-child(1) {
+              color: #333333;
+              font-size: 32upx;
+              font-weight: 600;
             }
-           
-        }
-        & .me-shop_box {
-            padding:50upx 20px 0;
-            & .me-shop_content {
-                position: relative;
-                z-index: 10;
-                & .me-shop_top {
-                    position: relative;
-                    & .shop-top_left {
-                       display: flex;
-                       padding: 40upx 30upx;
-                       align-items: center;
-                       & .top-info_box {
-                           padding-left: 30upx;
-                           & > view:nth-child(1){
-                               color: #333333;
-                               font-size: 32upx;
-                               font-weight: 600;
-
-                           }
-                           & > view:nth-child(2){
-                               color: #666666;
-                               font-size: 26upx;
-                               font-weight: 400;
-                               margin-top: 22upx;
-                           }
-                       }
-                    }
-                    & .chang-shop_btn {
-                        // padding: 20upx 13upx;
-                        // width: 176upx;
-                        // height: 50upx;
-                        // border: 1px solid #DDDDDD;
-                        border-radius: 25px;
-                        color: #666666;
-                        position: absolute;
-                        right: 20upx;
-                        top: 40upx;
-                        // text-align: center;
-                        & .iconqiehuan1 {
-                            margin-right: 10upx;
-                        }
-                    }
-                }
-                & > .image-box {
-                    width: 100%;
-                    height: 70upx;
-                    position: relative;
-                    z-index: 1;
-                    & > .dec {
-                        color: #FFFFFF;
-                        font-size: 24upx;
-                        font-weight: 500;
-                        position: absolute;
-                        top: 50%;
-                        left: 20upx;
-                        transform: translate(0,-50%);
-  
-                    }
-                    & > image {
-                        width: 100%;
-                        height: 100%;
-                    }
-                }
+            & > view:nth-child(2) {
+              color: #666666;
+              font-size: 26upx;
+              font-weight: 400;
+              margin-top: 22upx;
             }
+          }
         }
-        & .account-info_box {
-            margin-top: 20upx;
-            padding: 30upx 20upx;
-            display: flex;
-            & .info-lf_box {
-                flex: 1;
-                & > view:nth-child(1),& > view:nth-child(3) {
-                    font-weight: 400;
-                    font-size: 24upx;
-                }
-                 & > view:nth-child(1) {
-                     color: #999999;
-                 }
-                 & > view:nth-child(2) {
-                     color: #333333;
-                     font-size: 60upx;
-                     font-weight: bold;
-                     margin: 30upx 0;
-                     & > text {
-                         font-size: 24px;
-                     }
-                 }
-                 & > view:nth-child(3) {
-                     color: #666666;
-                 }
-            }
-            & > .admin-button-com {
-                width: 120upx;
-                height: 50upx;
-                border-radius: 25upx;
-            }
-            & .to-cash{
-               margin-left:20upx;
-               border:1upx solid rgba(0,0,0,.2);
-               border-radius:25upx;
-               font-size:22upx;
-               padding:0 15upx 0 15upx;
-            }
+        & .chang-shop_btn {
+          // padding: 20upx 13upx;
+          // width: 176upx;
+          // height: 50upx;
+          // border: 1px solid #DDDDDD;
+          border-radius: 25px;
+          color: #666666;
+          position: absolute;
+          right: 20upx;
+          top: 40upx;
+          // text-align: center;
+          & .iconqiehuan1 {
+            margin-right: 10upx;
+          }
         }
-        & .user-open_bx {
-            margin-top: 20px;
-            border-radius: 10px;
+      }
+      & > .image-box {
+        width: 100%;
+        height: 70upx;
+        position: relative;
+        z-index: 1;
+        & > .dec {
+          color: #ffffff;
+          font-size: 24upx;
+          font-weight: 500;
+          position: absolute;
+          top: 50%;
+          left: 20upx;
+          transform: translate(0, -50%);
         }
+        & > image {
+          width: 100%;
+          height: 100%;
+        }
+      }
+    }
+  }
+  & .account-info_box {
+    margin-top: 20upx;
+    padding: 30upx 20upx;
+    display: flex;
+    & .info-lf_box {
+      flex: 1;
+      & > view:nth-child(1),
+      & > view:nth-child(3) {
+        font-weight: 400;
+        font-size: 24upx;
+      }
+      & > view:nth-child(1) {
+        color: #999999;
+      }
+      & > view:nth-child(2) {
+        color: #333333;
+        font-size: 60upx;
+        font-weight: bold;
+        margin: 30upx 0;
+        & > text {
+          font-size: 24px;
+        }
+      }
+      & > view:nth-child(3) {
+        color: #666666;
+      }
+    }
+    & > .admin-button-com {
+      width: 120upx;
+      height: 50upx;
+      border-radius: 25upx;
+    }
+    & .to-cash {
+      margin-left: 20upx;
+      border: 1upx solid rgba(0, 0, 0, 0.2);
+      border-radius: 25upx;
+      font-size: 22upx;
+      padding: 0 15upx 0 15upx;
     }
+  }
+  & .user-open_bx {
+    margin-top: 20px;
+    border-radius: 10px;
+  }
+}
 </style>

+ 38 - 37
ghsApp/src/admin/home/member.vue

@@ -9,21 +9,23 @@
       itemWidth="50%"
     />
     <block v-if="!$util.isEmpty(list.data)">
-      <block v-for="(item,index) in list.data" :key="index">
+      <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
-					}
-				})"
+          @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}}</div>
+                <div class="tui-user-name">{{ item.name }}</div>
                 <appVipModule
                   v-if="item.level > 0"
                   class="level-img"
@@ -44,16 +46,17 @@
                 </template>
               </div>
               <div class="tui-msg-content">
-                <span>{{item.visitTime}}</span>
+                <span>{{ item.visitTime }}</span>
               </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>
+              :dot="item.level == 3 ? true : false"
+              v-if="item.messageNum > 0"
+              >{{ item.messageNum }}</badge-module
+            >
           </div>
         </tui-list-cell>
       </block>
@@ -70,7 +73,7 @@ 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 AppTag from "@/components/module/app-tag.vue";
 import { list } from "@/mixins";
 import { getClass, getList } from "@/api/member";
 export default {
@@ -81,7 +84,7 @@ export default {
     BadgeModule,
     AppWrapperEmpty,
     appVipModule,
-    AppTag
+    AppTag,
   },
   mixins: [list],
   data() {
@@ -90,32 +93,31 @@ export default {
       tabs: [
         {
           name: "全部",
-          value: 0
+          value: 0,
         },
         {
           name: "会员",
-          value: 0
-        }
-      ]
+          value: 0,
+        },
+      ],
     };
   },
   onPullDownRefresh() {
     this.resetList();
-    this._list().then(res => {
+    this._list().then((res) => {
       uni.stopPullDownRefresh();
     });
   },
   onReachBottom() {
     if (!this.list.finished) {
-      this._list().then(res => {
+      this._list().then((res) => {
         uni.stopPullDownRefresh();
       });
     } else {
       uni.stopPullDownRefresh();
     }
   },
-  onLoad(option) {
-  },
+  onLoad(option) {},
   methods: {
     init() {
       this._list();
@@ -128,8 +130,8 @@ export default {
         search: "",
         page: this.list.page,
         type: type,
-        ...this.form
-      }).then(res => {
+        ...this.form,
+      }).then((res) => {
         this.completes(res);
         if (this.$util.isEmpty(res.data)) return false;
         this.tabs[0].value = res.data.allNum;
@@ -140,19 +142,18 @@ export default {
       if (this.tabIndex == e.index) {
         return false;
       } else {
-        if(e.index == 3){
+        if (e.index == 3) {
           // this.showMoreUser = true;
           this.tabIndex = e.index;
-        }else{
+        } else {
           // this.showMoreUser = false;
           this.tabIndex = e.index;
           this.resetList();
           this._list();
         }
-
       }
     },
-  }
+  },
 };
 </script>
 
@@ -272,14 +273,14 @@ export default {
   justify-content: space-between;
   align-items: center;
 }
-.user_tag{
-  border:1px solid #CCCCCC;
-  padding:5px 12px 5px 12px;
-  border-radius:25px;
-  color:#BBBBBB;
-  margin-right:10px;
-  margin-bottom:12px;
-  display:inline-block;
-  font-size:30rpx;
+.user_tag {
+  border: 1px solid #cccccc;
+  padding: 5px 12px 5px 12px;
+  border-radius: 25px;
+  color: #bbbbbb;
+  margin-right: 10px;
+  margin-bottom: 12px;
+  display: inline-block;
+  font-size: 30rpx;
 }
 </style>

+ 545 - 518
ghsApp/src/admin/home/order.vue

@@ -1,117 +1,139 @@
 <template>
-	<div class="app-main app-content">
-		<view class="input-wrap_box">
-			<view>
-				<AppSearchModule placeholder="请输入客户名称,支持拼音首字母搜索" @search="searchFn" />
-			</view>
+  <div class="app-main app-content">
+    <view class="input-wrap_box">
+      <view>
+        <AppSearchModule
+          placeholder="请输入客户名称,支持拼音首字母搜索"
+          @search="searchFn"
+        />
+      </view>
 
-			<view class="select-dn_bx">
-				<DorpdownSelect
-					:menuObj="menuObj"
-					:selectItemId.sync="selectItemId"
-					:typeSelect="1" top="0px"
-					@selectSussess="selectSussess" />
-			</view>
-		</view>
-		<view class="app-tabs">
-		<app-tabs
-			:tabs="tabs"
-			:isFixed="false"
-			:top="50"
-			:currentTab="tabIndex"
-			:height="100"
-			@change="change"
-			itemWidth="20%"
-		/>
-		</view>
-		<div class="list-wrap">
-			<block v-if="!$util.isEmpty(list.data)">
-				<div
-					class="list"
-					v-for="(item, index) in list.data"
-					:key="index"
-					@click="pageTo({
-							url: '/pagesOrder/detail',
-							query: {
-								id: item.id
-							}
-						})
-					"
-				>
-					<view class="order-top_box">
-						<app-avatar-module :src="item.customAvatar" :width="50" />
-						<view class="tit">
-							{{ item.customName || "未命名" }}
-						</view>
-						<view
-							:class="[
-								'status',
-								item.status == '3' ? 'buleColor' : item.status == '6' ? 'defColor' : ''
-							]"
-						>
-							{{ statusFormat(item.status) }}
-						</view>
-					</view>
-					<view class="order-list_info">
-						<view class="order-info_box">
-							<view>日期:</view>
-							<view>{{ item.addTime }}</view>
-						</view>
-						<view class="order-info_box">
-							<view>单号:</view>
-							<view>{{ item.orderSn }}</view>
-						</view>
-						<view class="order-info_box">
-							<view>人员:</view>
-							<view>{{ item.adminName }}</view>
-						</view>
-						<view class="order-info_box">
-							<view>数量:</view>
-							<view>{{ `${item.bigNum}/${item.smallNum}` }}</view>
-							<view class="price">
-								<view>¥{{ item.actPrice }}</view>
-								<i class="iconfont iconxiangyou"></i>
-							</view>
-						</view>
-					</view>
-<!--					<div 						v-if="!$util.isEmpty(item.buttonList.filter(r => r.disable == 1))"  class="list-bottom" >-->
-					<div class="list-bottom" >
-						<div class="list-button">
-							<view v-for="s in item.buttonList" :key="s.type">
-								<button
-									@click.stop="openBt(s, item)"
-									v-if="s.show == 1"
-									:disabled="s.disable === 1"
-									class="admin-button-com bule"
-									:class="s.disable === 1?'active':''"
-								>
-									{{
-										s.type === "item" ? "改花材" : s.type === "selfGet" ? "自取" : "发货"
-									}}
-								</button>
-							</view>
-						</div>
-					</div>
-				</div>
-			</block>
-			<block v-else>
-				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
-			</block>
-		</div>
-<!--		时间段选择-->
-		<rangeDatePick
-			:show="isShow"
-			start="2000-01-01"
-			end="2200-12-01"
-			:value="customizationTime"
-			@change="timeChange"
-			@cancel="timeCancel"
-			themeColor="#4C83D6" fields="day"></rangeDatePick>
-	</div>
+      <view class="select-dn_bx">
+        <DorpdownSelect
+          :menuObj="menuObj"
+          :selectItemId.sync="selectItemId"
+          :typeSelect="1"
+          top="0px"
+          @selectSussess="selectSussess"
+        />
+      </view>
+    </view>
+    <view class="app-tabs">
+      <app-tabs
+        :tabs="tabs"
+        :isFixed="false"
+        :top="50"
+        :currentTab="tabIndex"
+        :height="100"
+        @change="change"
+        itemWidth="20%"
+      />
+    </view>
+    <div class="list-wrap">
+      <block v-if="!$util.isEmpty(list.data)">
+        <div
+          class="list"
+          v-for="(item, index) in list.data"
+          :key="index"
+          @click="
+            pageTo({
+              url: '/pagesOrder/detail',
+              query: {
+                id: item.id,
+              },
+            })
+          "
+        >
+          <view class="order-top_box">
+            <app-avatar-module :src="item.customAvatar" :width="50" />
+            <view class="tit">
+              {{ item.customName || "未命名" }}
+            </view>
+            <view
+              :class="[
+                'status',
+                item.status == '3'
+                  ? 'buleColor'
+                  : item.status == '6'
+                  ? 'defColor'
+                  : '',
+              ]"
+            >
+              {{ statusFormat(item.status) }}
+            </view>
+          </view>
+          <view class="order-list_info">
+            <view class="order-info_box">
+              <view>日期:</view>
+              <view>{{ item.addTime }}</view>
+            </view>
+            <view class="order-info_box">
+              <view>单号:</view>
+              <view>{{ item.orderSn }}</view>
+            </view>
+            <view class="order-info_box">
+              <view>人员:</view>
+              <view>{{ item.adminName }}</view>
+            </view>
+            <view class="order-info_box">
+              <view>数量:</view>
+              <view>{{ `${item.bigNum}/${item.smallNum}` }}</view>
+              <view class="price">
+                <view>¥{{ item.actPrice }}</view>
+                <i class="iconfont iconxiangyou"></i>
+              </view>
+            </view>
+          </view>
+          <!--					<div 						v-if="!$util.isEmpty(item.buttonList.filter(r => r.disable == 1))"  class="list-bottom" >-->
+          <div class="list-bottom">
+            <div class="list-button">
+              <view v-for="s in item.buttonList" :key="s.type">
+                <button
+                  @click.stop="openBt(s, item)"
+                  v-if="s.show == 1"
+                  :disabled="s.disable === 1"
+                  class="admin-button-com bule"
+                  :class="s.disable === 1 ? 'active' : ''"
+                >
+                  {{
+                    s.type === "item"
+                      ? "改花材"
+                      : s.type === "selfGet"
+                      ? "自取"
+                      : "发货"
+                  }}
+                </button>
+              </view>
+            </div>
+          </div>
+        </div>
+      </block>
+      <block v-else>
+        <app-wrapper-empty
+          title="暂无数据"
+          :is-empty="$util.isEmpty(list.data)"
+        />
+      </block>
+    </div>
+    <!--		时间段选择-->
+    <rangeDatePick
+      :show="isShow"
+      start="2000-01-01"
+      end="2200-12-01"
+      :value="customizationTime"
+      @change="timeChange"
+      @cancel="timeCancel"
+      themeColor="#4C83D6"
+      fields="day"
+    ></rangeDatePick>
+  </div>
 </template>
 
 <script>
-const Month = (new Date().getMonth()+1)<10?'0'+(new Date().getMonth()+1):new Date().getMonth()+1
+const Month =
+  new Date().getMonth() + 1 < 10
+    ? "0" + (new Date().getMonth() + 1)
+    : new Date().getMonth() + 1;
 const time = `${new Date().getFullYear()}-${Month}-${new Date().getDate()}`;
 import AppTabs from "@/components/plugin/tabs";
 // import ListModule from "@/components/module/app-order-list";
@@ -125,429 +147,434 @@ import { getListB, freeShipping } from "@/api/order";
 import AppSearchModule from "@/components/module/app-search";
 import DorpdownSelect from "@/components/module/dorpdownSelect";
 import AppAvatarModule from "@/components/module/app-avatar";
-import rangeDatePick from '@/components/pyh-rdtpicker/pyh-rdtpicker.vue';
+import rangeDatePick from "@/components/pyh-rdtpicker/pyh-rdtpicker.vue";
 export default {
-	name: "order-list",
-	components: {
-		// ListModule,
-		rangeDatePick,
-		AppTabs,
-		AppWrapperEmpty,
-		ModalModule,
-		AppSearchModule,
-		DorpdownSelect,
-		AppAvatarModule
-	},
-	mixins: [list],
-	computed: {		...mapGetters(["getLoginInfo","getDictionariesInfo"])	},
-	data() {
-		return {
-			seekVal: '',
-			isShow: false,//是否显选择时间段
-			customizationTime:[],//时间段
-			customizationTimeType:'',//时间段
-			menuObj:'',//时间筛选列表
-			tabIndex: 0,
-			// classifyModal:false,
-			tabs: [
-				{
-					name: "全部",
-					value: 0,
-					id: 0
-				},
-				{
-					name: "待付款",
-					value: 0,
-					id: 1
-				},
-				{
-					name: "待配送",
-					value: 0,
-					id: 2
-				},
-				{
-					name: "配送中",
-					value: 0,
-					id: 3
-				},
-				{
-					name: "已完结",
-					value: 0,
-					id: 6
-				},
-
-			],
-			selectItemId:'',
-			operateIndex: null,
-			operateData: {},
-			// 免发货
-			freeShipModal: false,
-			classifyForm: {
-				categoryId: "",
-				usageId: ""
-			}
-		};
-	},
-	onPullDownRefresh() {
-		this.resetList();
-		this._list().then(res => {
-			uni.stopPullDownRefresh();
-		});
-	},
-	onReachBottom() {
-		if (!this.list.finished) {
-			this._list().then(res => {
-				uni.stopPullDownRefresh();
-			});
-		} else {
-			uni.stopPullDownRefresh();
-		}
-	},
-	mounted() {
-		// getCategory()
-		// getUsage()
-	},
-	onLoad(option) {
-		let dateDefaultOption = [];
-		let list = this.getDictionariesInfo.dateDefaultOption;
-		for (let i=0;i<list.length;i++){
-			dateDefaultOption.push({name:list[i].name,id:list[i].value})
-		}
-		this.menuObj = {title:'时间',titleChild:'时间',list: dateDefaultOption};
-		let tabIndex = uni.getStorageSync("switchTabQuery") || null;
-		if (tabIndex) {
-		  uni.removeStorageSync("switchTabQuery");
-		  this.tabIndex = parseInt(tabIndex.tabIndex);
-		}
-	},
-	onShow() {
-		let tabIndex = uni.getStorageSync("switchTabQuery") || null;
-		if (tabIndex) {
-		  uni.removeStorageSync("switchTabQuery");
-		  this.tabIndex = parseInt(tabIndex.tabIndex);
-		}
-		 this._list();
-	},
-	methods: {
-		selectTime(type){
-			this.customizationTime = [time,time],
-			this.customizationTimeType = type,
-			this.isShow = true;
-		},
-		//选择自定义时间确定
-		timeChange(e){
-			this.isShow = false;
-			this.resetList();
-			this._list(this.customizationTimeType,e);
-		},
-		//选择自定义时间取消
-		timeCancel(e){this.isShow = false;},
-		statusFormat(status) {
-			switch (status) {
-				case "1":
-					return "待付款";
-					break;
-				case "2":
-					return "待配送";
-					break;
-				case "3":
-					return "配送中";
-					break;
-				case "4":
-					return "已完成";
-					break;
-				case "5":
-					return "已取消";
-					break;
-				case "6":
-					return "已退款";
-					break;
-				default:
-					return "";
-			}
-		}, // 操作按钮
-		openBt(s, item) {
-			console.log(123)
-			// 花材
-			if (s.type === "item") {
-				uni.navigateTo({url: `/pagesOrder/select?id=${item.id}`});
-				// 自取
-			} else if (s.type === "selfGet") {
-				this.operateData = item;
-				let self = this;
-				uni.showModal({
-					title: '提示',
-					content: '确认客户已自取',
-					confirmText: "确认",
-					success: function (res) {
-						if (res.confirm) {
-							self.freeShipModalClick()
-						}
-					}
-				});
-				//发货
-			} else if (s.type === "send") {
-				this.pageTo({
-					url: "/pagesOrder/ship",
-					query: {
-						id: item.id
-					}
-				});
-			}
-		},
-		selectSussess(val) {
-			// this._list();
-			console.log(val);
-			if(val.select=='自定义'){
-				this.selectTime(val.selectItem.id);
-			}else{
-				this.resetList();
-				this._list(val.selectItem.id,'');
-			}
-		},
-		searchFn(e) {
-			this.resetList();
-			this.seekVal = e;
-			this._list();
-		},
-		_list(type,timeArr) {
-			return getListB({
-				searchTime:type,
-				startTime:timeArr?timeArr[0]:'',
-				endTime:timeArr?timeArr[1]:'',
-				status: this.tabs[this.tabIndex].id,
-				name: this.seekVal,
-				page: this.list.page,
-			}).then(res => {
-				this.completes(res);
-				if (this.$util.isEmpty(res.data)) return false;
-				this.tabs[0].value = res.data.allNum || 0;
-				this.tabs[1].value = res.data.unPayNum || 0;
-				this.tabs[2].value = res.data.unSendNum || 0;
-				this.tabs[3].value = res.data.sendingNum || 0;
-				this.tabs[4].value = res.data.finishNum || 0;
-			});
-		},
-		change(e) {
-			console.log(e);
-			if (this.tabIndex == e.index) {
-				return false;
-			} else {
-				this.tabIndex = e.index;
-				this.resetList();
-				this._list();
-			}
-		},
-		// 免发货
-		// freeShippingFn(item, index) {
-		//   // this.operateIndex = index;
-		//   this.operateData = item;
-		//   this.freeShipModal = true;
-		// },
-		// 免发货
-		freeShipModalClick(e) {
-
-				freeShipping({ id: this.operateData.id }).then(res => {
-					this._list();
-					this.$msg("操作成功!");
-				});
-			
-		},
-		// 查看配送
-		seeSendFn(item) {
-			this.$util.pageTo({
-				url: "/admin/order/ship",
-				query: {
-					id: item.id,
-					pageStatus: 5
-				}
-			});
-		},
-		// 关闭弹窗
-		modalCancel() {
-			this.freeShipModal = false;
-			// this.classifyModal = false;
-		},
-		classifyOrder(id) {
-			// this.classifyModal = true
-			this.currentOrderId = id;
-		}
-		// confirmClassify(e) {
-		// 	if (e.index === 0) {
-		// 		this.modalCancel()
-		// 	} else {
-		// 		orderClass({
-		// 			id: this.currentOrderId,
-		// 			...this.classifyForm
-		// 		}).then(res => {
-		//       this.classifyModal = false;
-		// 			this.$msg('分类成功!')
-		// 		})
-		// 	}
-		// },
-		// selCategoryFn(item) {
-		//   this.classifyForm.categoryId = item.id
-		// },
-		// selUsageFn(item) {
-		//   this.classifyForm.usageId = item.id
-		// }
-	}
+  name: "order-list",
+  components: {
+    // ListModule,
+    rangeDatePick,
+    AppTabs,
+    AppWrapperEmpty,
+    ModalModule,
+    AppSearchModule,
+    DorpdownSelect,
+    AppAvatarModule,
+  },
+  mixins: [list],
+  computed: { ...mapGetters(["getLoginInfo", "getDictionariesInfo"]) },
+  data() {
+    return {
+      seekVal: "",
+      isShow: false, //是否显选择时间段
+      customizationTime: [], //时间段
+      customizationTimeType: "", //时间段
+      menuObj: "", //时间筛选列表
+      tabIndex: 0,
+      // classifyModal:false,
+      tabs: [
+        {
+          name: "全部",
+          value: 0,
+          id: 0,
+        },
+        {
+          name: "待付款",
+          value: 0,
+          id: 1,
+        },
+        {
+          name: "待配送",
+          value: 0,
+          id: 2,
+        },
+        {
+          name: "配送中",
+          value: 0,
+          id: 3,
+        },
+        {
+          name: "已完结",
+          value: 0,
+          id: 6,
+        },
+      ],
+      selectItemId: "",
+      operateIndex: null,
+      operateData: {},
+      // 免发货
+      freeShipModal: false,
+      classifyForm: {
+        categoryId: "",
+        usageId: "",
+      },
+    };
+  },
+  onPullDownRefresh() {
+    this.resetList();
+    this._list().then((res) => {
+      uni.stopPullDownRefresh();
+    });
+  },
+  onReachBottom() {
+    if (!this.list.finished) {
+      this._list().then((res) => {
+        uni.stopPullDownRefresh();
+      });
+    } else {
+      uni.stopPullDownRefresh();
+    }
+  },
+  mounted() {
+    // getCategory()
+    // getUsage()
+  },
+  onLoad(option) {
+    let dateDefaultOption = [];
+    let list = this.getDictionariesInfo.dateDefaultOption;
+    for (let i = 0; i < list.length; i++) {
+      dateDefaultOption.push({ name: list[i].name, id: list[i].value });
+    }
+    this.menuObj = {
+      title: "时间",
+      titleChild: "时间",
+      list: dateDefaultOption,
+    };
+    let tabIndex = uni.getStorageSync("switchTabQuery") || null;
+    if (tabIndex) {
+      uni.removeStorageSync("switchTabQuery");
+      this.tabIndex = parseInt(tabIndex.tabIndex);
+    }
+  },
+  onShow() {
+    let tabIndex = uni.getStorageSync("switchTabQuery") || null;
+    if (tabIndex) {
+      uni.removeStorageSync("switchTabQuery");
+      this.tabIndex = parseInt(tabIndex.tabIndex);
+    }
+    this._list();
+  },
+  methods: {
+    selectTime(type) {
+      (this.customizationTime = [time, time]),
+        (this.customizationTimeType = type),
+        (this.isShow = true);
+    },
+    //选择自定义时间确定
+    timeChange(e) {
+      this.isShow = false;
+      this.resetList();
+      this._list(this.customizationTimeType, e);
+    },
+    //选择自定义时间取消
+    timeCancel(e) {
+      this.isShow = false;
+    },
+    statusFormat(status) {
+      switch (status) {
+        case "1":
+          return "待付款";
+          break;
+        case "2":
+          return "待配送";
+          break;
+        case "3":
+          return "配送中";
+          break;
+        case "4":
+          return "已完成";
+          break;
+        case "5":
+          return "已取消";
+          break;
+        case "6":
+          return "已退款";
+          break;
+        default:
+          return "";
+      }
+    }, // 操作按钮
+    openBt(s, item) {
+      console.log(123);
+      // 花材
+      if (s.type === "item") {
+        uni.navigateTo({ url: `/pagesOrder/select?id=${item.id}` });
+        // 自取
+      } else if (s.type === "selfGet") {
+        this.operateData = item;
+        let self = this;
+        uni.showModal({
+          title: "提示",
+          content: "确认客户已自取",
+          confirmText: "确认",
+          success: function (res) {
+            if (res.confirm) {
+              self.freeShipModalClick();
+            }
+          },
+        });
+        //发货
+      } else if (s.type === "send") {
+        this.pageTo({
+          url: "/pagesOrder/ship",
+          query: {
+            id: item.id,
+          },
+        });
+      }
+    },
+    selectSussess(val) {
+      // this._list();
+      console.log(val);
+      if (val.select == "自定义") {
+        this.selectTime(val.selectItem.id);
+      } else {
+        this.resetList();
+        this._list(val.selectItem.id, "");
+      }
+    },
+    searchFn(e) {
+      this.resetList();
+      this.seekVal = e;
+      this._list();
+    },
+    _list(type, timeArr) {
+      return getListB({
+        searchTime: type,
+        startTime: timeArr ? timeArr[0] : "",
+        endTime: timeArr ? timeArr[1] : "",
+        status: this.tabs[this.tabIndex].id,
+        name: this.seekVal,
+        page: this.list.page,
+      }).then((res) => {
+        this.completes(res);
+        if (this.$util.isEmpty(res.data)) return false;
+        this.tabs[0].value = res.data.allNum || 0;
+        this.tabs[1].value = res.data.unPayNum || 0;
+        this.tabs[2].value = res.data.unSendNum || 0;
+        this.tabs[3].value = res.data.sendingNum || 0;
+        this.tabs[4].value = res.data.finishNum || 0;
+      });
+    },
+    change(e) {
+      console.log(e);
+      if (this.tabIndex == e.index) {
+        return false;
+      } else {
+        this.tabIndex = e.index;
+        this.resetList();
+        this._list();
+      }
+    },
+    // 免发货
+    // freeShippingFn(item, index) {
+    //   // this.operateIndex = index;
+    //   this.operateData = item;
+    //   this.freeShipModal = true;
+    // },
+    // 免发货
+    freeShipModalClick(e) {
+      freeShipping({ id: this.operateData.id }).then((res) => {
+        this._list();
+        this.$msg("操作成功!");
+      });
+    },
+    // 查看配送
+    seeSendFn(item) {
+      this.$util.pageTo({
+        url: "/admin/order/ship",
+        query: {
+          id: item.id,
+          pageStatus: 5,
+        },
+      });
+    },
+    // 关闭弹窗
+    modalCancel() {
+      this.freeShipModal = false;
+      // this.classifyModal = false;
+    },
+    classifyOrder(id) {
+      // this.classifyModal = true
+      this.currentOrderId = id;
+    },
+    // confirmClassify(e) {
+    // 	if (e.index === 0) {
+    // 		this.modalCancel()
+    // 	} else {
+    // 		orderClass({
+    // 			id: this.currentOrderId,
+    // 			...this.classifyForm
+    // 		}).then(res => {
+    //       this.classifyModal = false;
+    // 			this.$msg('分类成功!')
+    // 		})
+    // 	}
+    // },
+    // selCategoryFn(item) {
+    //   this.classifyForm.categoryId = item.id
+    // },
+    // selUsageFn(item) {
+    //   this.classifyForm.usageId = item.id
+    // }
+  },
 };
 </script>
 <style lang="scss" scoped>
 .admin-button-com {
-	width: 140px;
-	height: 60px;
-	padding: 0;
-	line-height: 60px;
-	text-align: center;
-	font-size: 26px;
-	&.active{
-		border: 1px solid #ccc;
-	}
+  width: 140px;
+  height: 60px;
+  padding: 0;
+  line-height: 60px;
+  text-align: center;
+  font-size: 26px;
+  &.active {
+    border: 1px solid #ccc;
+  }
 }
 .app-content {
-	padding-top: 100px;
-	padding-bottom: 1px;
-	.select-dn_bx {
-		padding-left: 48px;
-	}
-	.app-tabs{
-		position: fixed;width:100%;z-index: 9;
-	}
-	.input-wrap_box {
-		background-color: #fff;
-		position: fixed;
-		top: 0;
-		z-index: 10;
-		width: 100%;
-		height: 100px;
-		display: flex;
-		align-items: center;
-		padding: 0 30px;
-		& > view:nth-child(1) {
-			flex: 1;
-		}
-	}
-	.list-wrap {
-		padding-top: 100rpx;
-		.list {
-			background-color: #fff;
-			margin-bottom: 20px;
-			.list-top,
-			.list-bottom {
-				padding: 15px 30px;
-				border-bottom: 1px solid $borderColor;
-				color: $fontColor3;
-				.freight-text {
-					margin-right: 60px;
-				}
-			}
-			.list-bottom {
-				& > div {
-					@include disFlex(center, flex-end);
-				}
-				.list-button {
-					// margin-top: 26px;
-					.admin-button-com {
-						margin-left: 20px;
-					}
-				}
-			}
-		}
-	}
+  padding-top: 100px;
+  padding-bottom: 1px;
+  .select-dn_bx {
+    padding-left: 48px;
+  }
+  .app-tabs {
+    position: fixed;
+    width: 100%;
+    z-index: 9;
+  }
+  .input-wrap_box {
+    background-color: #fff;
+    position: fixed;
+    top: 0;
+    z-index: 10;
+    width: 100%;
+    height: 100px;
+    display: flex;
+    align-items: center;
+    padding: 0 30px;
+    & > view:nth-child(1) {
+      flex: 1;
+    }
+  }
+  .list-wrap {
+    padding-top: 100rpx;
+    .list {
+      background-color: #fff;
+      margin-bottom: 20px;
+      .list-top,
+      .list-bottom {
+        padding: 15px 30px;
+        border-bottom: 1px solid $borderColor;
+        color: $fontColor3;
+        .freight-text {
+          margin-right: 60px;
+        }
+      }
+      .list-bottom {
+        & > div {
+          @include disFlex(center, flex-end);
+        }
+        .list-button {
+          // margin-top: 26px;
+          .admin-button-com {
+            margin-left: 20px;
+          }
+        }
+      }
+    }
+  }
 }
 // 弹窗
 .upload-confirm-wrap {
-	max-height: 600px;
-	overflow-y: auto;
-	.modal-tit {
-		@include disFlex(center, center);
-		font-size: 40px;
-		margin-top: 30px;
-		margin-bottom: 50px;
-		.iconfont {
-			color: #09bb07;
-			margin-right: 20px;
-			font-size: 50px;
-		}
-	}
-	//  分类
-	.sel-wrap {
-		color: $fontColor2;
-		font-size: 32px;
-		.sel-tit {
-			text-align: left;
-		}
-		.sel-btn {
-			@include disFlex(center, flex-start);
-			flex-wrap: wrap;
-			padding: 10px 0 40px;
-			.admin-button-com {
-				// width: 170px;
-				margin-right: 20px;
-				margin-top: 20px;
-				padding-top: 16px;
-				padding-bottom: 16px;
-				border-radius: 4px;
-				// &:nth-child(3n + 1) {
-				// 	margin-left: 0;
-				// }
-			}
-		}
-	}
+  max-height: 600px;
+  overflow-y: auto;
+  .modal-tit {
+    @include disFlex(center, center);
+    font-size: 40px;
+    margin-top: 30px;
+    margin-bottom: 50px;
+    .iconfont {
+      color: #09bb07;
+      margin-right: 20px;
+      font-size: 50px;
+    }
+  }
+  //  分类
+  .sel-wrap {
+    color: $fontColor2;
+    font-size: 32px;
+    .sel-tit {
+      text-align: left;
+    }
+    .sel-btn {
+      @include disFlex(center, flex-start);
+      flex-wrap: wrap;
+      padding: 10px 0 40px;
+      .admin-button-com {
+        // width: 170px;
+        margin-right: 20px;
+        margin-top: 20px;
+        padding-top: 16px;
+        padding-bottom: 16px;
+        border-radius: 4px;
+        // &:nth-child(3n + 1) {
+        // 	margin-left: 0;
+        // }
+      }
+    }
+  }
 }
 .order-top_box {
-	display: flex;
-	align-items: center;
-	padding: 20px 30px 20px;
-	& > .tit {
-		color: #333333;
-		font-size: 32px;
-		font-weight: 600;
-		margin-left: 20px;
-	}
-	& > .status {
-		flex: 1;
-		text-align: right;
-		color: #ff2842;
-		&.buleColor {
-			color: #3385ff;
-		}
-		&.defColor {
-			color: #333333;
-		}
-	}
+  display: flex;
+  align-items: center;
+  padding: 20px 30px 20px;
+  & > .tit {
+    color: #333333;
+    font-size: 32px;
+    font-weight: 600;
+    margin-left: 20px;
+  }
+  & > .status {
+    flex: 1;
+    text-align: right;
+    color: #ff2842;
+    &.buleColor {
+      color: #3385ff;
+    }
+    &.defColor {
+      color: #333333;
+    }
+  }
 }
 
 .order-list_info {
-	padding: 10px 30px 30px;
-	border-bottom: 1px solid #eeeeee;
-	& > .order-info_box {
-		display: flex;
-		align-items: center;
-		font-size: 26px;
-		font-weight: 400;
-		margin-bottom: 5px;
-		& > view:nth-child(1) {
-			color: #999999;
-		}
-		& > view:nth-child(2) {
-			color: #333333;
-		}
-		& > .price {
-			flex: 1;
-			font-size: 30px;
-			color: #333333;
-			display: flex;
-			align-items: center;
-			justify-content: flex-end;
-			& .iconxiangyou {
-				color: #999999;
-				font-size: 25px;
-				margin-left: 12px;
-			}
-		}
-	}
+  padding: 10px 30px 30px;
+  border-bottom: 1px solid #eeeeee;
+  & > .order-info_box {
+    display: flex;
+    align-items: center;
+    font-size: 26px;
+    font-weight: 400;
+    margin-bottom: 5px;
+    & > view:nth-child(1) {
+      color: #999999;
+    }
+    & > view:nth-child(2) {
+      color: #333333;
+    }
+    & > .price {
+      flex: 1;
+      font-size: 30px;
+      color: #333333;
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+      & .iconxiangyou {
+        color: #999999;
+        font-size: 25px;
+        margin-left: 12px;
+      }
+    }
+  }
 }
 </style>