订单列表

ghsApp/src/pagesStore/me/cashSet.vue

@@ -37,7 +37,7 @@
 
         </div>
 
-        <view style="color:red;font-weight:bold;margin:20upx 0 10upx 25upx;font-size:27upx;">需要修改请先联系管理员，自行修改无效。</view>
+        <view style="color:red;font-weight:bold;margin:20upx 0 10upx 25upx;font-size:28upx;">需要修改请联系管理员，自行修改无效。</view>
 
         <div class="confirm-btn">
           <button class="admin-button-com big blue" formType="submit"> 提交 </button>

hdApp/src/admin/billing/toPay.vue

@@ -50,7 +50,7 @@
   </view>
 </template>
 <script>
-import { cancel,debtPay,getDetail,codePay,codePayCheck} from "@/api/order";
+import { cancelOrder,debtPay,getDetail,codePay,codePayCheck} from "@/api/order";
 export default {
   name: "toPay",
   components: {
@@ -207,7 +207,7 @@ export default {
         content = '客户正在付款，提醒客户退出付款界面，再点确认'
       }
       that.$util.confirmModal({content:content,cancelText:'返回'},() => {
-          cancel({id:this.orderId}).then(res=>{
+          cancelOrder({id:this.orderId}).then(res=>{
             if(res.code == 1){
               that.$msg(res.msg)
               setTimeout(function(){

hdApp/src/admin/home/me.vue

@@ -97,17 +97,13 @@
               <view class="tui-title">美团云音箱</view>
             </tui-list-cell>
 
-            <tui-list-cell @click="pageTo({ url: '/admin/jc/index' })" class="line-cell" :hover="false" :arrow="true">
-              <view class="tui-title">教学视频</view>
-            </tui-list-cell>
-
             <tui-list-cell @click="openPfShop()" class="line-cell" :hover="false" :arrow="true" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentShopId > 0 && getLoginInfo.pfShopId == 0">
               <view class="tui-title" style="color:red;">我要开批发店</view>
             </tui-list-cell>
 
             <!-- #ifdef APP-PLUS -->
             <tui-list-cell @click="getHzg()" class="line-cell" :hover="false" :arrow="true">
-              <view class="tui-title">下载最新版</view>
+              <view class="tui-title">下载APP</view>
             </tui-list-cell>
 
             <tui-list-cell @click="closeApp()" class="line-cell" :hover="false" :arrow="true" v-if="!$util.isEmpty(getLoginInfo.admin) && getLoginInfo.admin.currentShopId > 0">

hdApp/src/admin/home/member.vue

@@ -5,7 +5,7 @@
       <view>
         <AppSearchModule placeholder="这里搜索" @input="searchFn"/>
       </view>
-      <view style="padding:0 5upx 0 10upx;" >
+      <view style="padding:0 10upx 0 10upx;" >
         <button class="admin-button-com middle blue" style="margin-right:10upx;" @click="invite()">邀请注册</button>
 				<button class="admin-button-com middle blue" @click="addCustom()">添加</button>
 			</view>
@@ -96,13 +96,13 @@ export default {
   },
   onPullDownRefresh() {
     this.resetList();
-    this.getOrderList().then(res => {
+    this.getMyCustomList().then(res => {
       uni.stopPullDownRefresh();
     });
   },
   onReachBottom() {
     if (!this.list.finished) {
-      this.getOrderList().then(res => {
+      this.getMyCustomList().then(res => {
         uni.stopPullDownRefresh();
       });
     } else {
@@ -118,23 +118,25 @@ export default {
       }
       this.tabIndex = e.index;
       this.resetList();
-      this.getOrderList();
+      this.getMyCustomList();
     },
     invite(){
+      this.$msg('开发中')
+      return false
       this.pageTo({url: '/admin/cg/member'})
     },
     addCustom(){
       this.pageTo({url: '/admin/custom/addCustom'})
     },
     init() {
-      this.getOrderList()      
+      this.getMyCustomList()      
     },
     searchFn(e) {
       this.resetList();
       this.seekVal = e;
-      this.getOrderList()
+      this.getMyCustomList()
     },
-    getOrderList() {
+    getMyCustomList() {
       return getList({ search:"", page:this.list.page,type:this.tabIndex,name: this.seekVal }).then(res => {
         if(res.code == 1){
           this.completes(res)

hdApp/src/admin/home/order.vue

@@ -11,9 +11,9 @@
 				<app-search-module v-model="py" placeholder="请输入" @input="searchFn" />
 			</view>
 			<view style="float:right">
-      <button class="admin-button-com mini-btn blue" style="margin-right:8upx;" @click="selectStaffFn()">员工</button>
-      <button class="admin-button-com mini-btn blue" style="margin-right:8upx;" @click="debtChangeFn()">欠款</button>
-      <button class="admin-button-com mini-btn blue" @click="cancelFn()">全部</button>
+      <button class="admin-button-com middle blue" style="margin-right:8upx;" @click="selectStaffFn()">员工</button>
+      <button class="admin-button-com middle blue" style="margin-right:8upx;" @click="debtChangeFn()">赊账单</button>
+      <button class="admin-button-com middle blue" @click="cancelFn()">清空搜索</button>
 			</view>
 		</view>
     <view class="list-wrap">
@@ -21,8 +21,8 @@
         <view class="list" v-for="(item, index) in list.data" :key="index" @click="pageTo({ url: '/admin/order/detail', query: { id: item.id } })" >
           <view class="list-top flex-center-between" style="border-bottom:1upx solid #EEEEEE;">
             <view class="app-color-3" style="font-size:28upx;font-weight:bold;color:#333333;">编号 {{ item.sendNum }}<text v-if="item.bookName!=''" style="margin-left:12upx;">| {{item.bookName}}</text></view>
-            <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;color:red;padding:5upx 10upx;" v-if="item.debt == 1">有欠款</view>
-            <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;color:red;padding:5upx 10upx;" v-if="item.refund == 1">有退款</view>
+            <view style="border:1upx solid red;border-radius:18upx;font-size:19upx;padding:5upx 10upx;background-color: red;color:white;" v-if="item.debt == 1">赊账</view>
+            <view style="border:1upx solid #0e7ed8;border-radius:18upx;font-size:19upx;color:white;padding:5upx 10upx;background-color: #0e7ed8;" v-if="item.refund == 1">有售后</view>
             <view style="font-size:28upx;" class='app-price app-green'>{{ item.status | constantfilter('ORDER_STATUS') }}</view>
           </view>
           <view class="list-blo">
@@ -101,7 +101,8 @@ export default {
       debt:2,
       searchTypeName:'价格',
       searchType:0,
-      searchOption:['价格', '单号','手机','名称']
+      searchOption:['价格', '单号','手机','名称'],
+      refreshPage:1
     };
   },
   onPullDownRefresh () {
@@ -139,6 +140,14 @@ export default {
         this.staffList = res.data.list
       }
     })
+
+    if(this.refreshPage == 1){
+      this.resetList();
+      this.getOrderList()
+    }else{
+      this.refreshPage = 1
+    }
+
   },
   methods: {
     setSearchType(){
@@ -364,7 +373,7 @@ export default {
   height:110upx;
   .search-bar {
     display:inline-block;
-    width:290upx;
+    width:190upx;
   }
 }
 </style>

hdApp/src/admin/order/detail.vue

@@ -210,6 +210,12 @@ export default {
     };
   },
   onLoad() {
+
+    //返回上一页时不需要刷新
+		let pages = getCurrentPages();
+		let prevPage = pages[ pages.length - 2 ];
+		prevPage.$vm.refreshPage = 0
+
   },
   methods: {
     clear(item){

hdApp/src/pagesStore/me/cashSet.vue

@@ -43,7 +43,8 @@
           </tui-list-cell>
         </div>
 
-        <!-- 提交 -->
+        <view style="color:red;font-weight:bold;margin:20upx 0 10upx 25upx;font-size:28upx;">需要修改请联系管理员，自行修改无效。</view>
+
         <div class="confirm-btn">
           <button class="admin-button-com big blue" formType="submit">
             提交