shish пре 3 година
родитељ
комит
6bd1cc4f4b
3 измењених фајлова са 28 додато и 10 уклоњено
  1. 17 4
      hdApp/src/admin/home/order.vue
  2. 5 0
      mallApp/src/api/hd/index.js
  3. 6 6
      mallApp/src/pages/home/recent.vue

+ 17 - 4
hdApp/src/admin/home/order.vue

@@ -6,8 +6,9 @@
 				<app-search-module v-model="py" placeholder="输入订花人 / 编号" @input="searchFn" />
 				<app-search-module v-model="py" placeholder="输入订花人 / 编号" @input="searchFn" />
 			</view>
 			</view>
 			<view style="float:right">
 			<view style="float:right">
-      <button class="admin-button-com middle blue" style="margin-right:15upx;" @click="selectStaffFn()">选择开单人</button>
-      <button class="admin-button-com middle blue" @click="cancelSelectFn()">取消选择</button>
+      <button class="admin-button-com middle blue" style="margin-right:10upx;" @click="selectStaffFn()">开单人</button>
+      <button class="admin-button-com middle blue" style="margin-right:10upx;" @click="debtChangeFn()">有尾款</button>
+      <button class="admin-button-com middle blue" @click="cancelFn()">取消</button>
 			</view>
 			</view>
 		</view>
 		</view>
     <view class="list-wrap">
     <view class="list-wrap">
@@ -91,7 +92,8 @@ export default {
       classifyForm: { categoryId: '', usageId: '' },
       classifyForm: { categoryId: '', usageId: '' },
       staffList:[],
       staffList:[],
       shopAdminId:0,
       shopAdminId:0,
-      searchText:''
+      searchText:'',
+      debt:2
     };
     };
   },
   },
   onPullDownRefresh () {
   onPullDownRefresh () {
@@ -159,9 +161,19 @@ export default {
     selectStaffFn(){
     selectStaffFn(){
       this.$refs.getStaffRef.open('top')
       this.$refs.getStaffRef.open('top')
     },
     },
-    cancelSelectFn(){
+    debtChangeFn(){
+      if(this.debt == 2){
+        this.debt = 1
+      }else{
+        this.debt = this.debt == 0 ? 1 : 0
+      }
+      this.resetList();
+      this.getOrderList()
+    },
+    cancelFn(){
       this.resetList();
       this.resetList();
       this.shopAdminId = 0
       this.shopAdminId = 0
+      this.debt = 2
       this.getOrderList()
       this.getOrderList()
     },
     },
     printOrder(item){
     printOrder(item){
@@ -181,6 +193,7 @@ export default {
         search: "",
         search: "",
         shopAdminId:this.shopAdminId,
         shopAdminId:this.shopAdminId,
         searchText:this.searchText,
         searchText:this.searchText,
+        debt:this.debt,
         page: this.list.page
         page: this.list.page
       }).then(res => {
       }).then(res => {
         this.completes(res);
         this.completes(res);

+ 5 - 0
mallApp/src/api/hd/index.js

@@ -0,0 +1,5 @@
+import https from '@/plugins/luch-request_0.0.7/request'
+
+export const getList = data => {
+	return https.get('/hd/list', data)
+}

+ 6 - 6
mallApp/src/pages/home/recent.vue

@@ -19,7 +19,7 @@
                   <image class="logo" :src="item.smallAvatar" />
                   <image class="logo" :src="item.smallAvatar" />
                 </view>
                 </view>
                 <view class="text-group_7 flex-col justify-between">
                 <view class="text-group_7 flex-col justify-between">
-                  <text class="text_8">{{item.showName}}</text>
+                  <text class="text_8">{{item.name}}</text>
                   <text class="text_9">{{item.address}}{{item.floor}}</text>
                   <text class="text_9">{{item.address}}{{item.floor}}</text>
                 </view>
                 </view>
               </view>
               </view>
@@ -36,7 +36,7 @@
         </view>
         </view>
       </view>
       </view>
       <view v-else>
       <view v-else>
-        <text style="margin-top:30upx;margin-left:30upx;">暂无花店</text>
+        <text style="margin-top:200upx;margin-left:80upx;font-size:30upx;font-weight:bold;">暂无花店</text>
       </view>
       </view>
 
 
   </block>
   </block>
@@ -84,7 +84,7 @@ import AppSwiper from "@/components/app-swiper";
 import TuiListCell from "@/components/plugin/list-cell";
 import TuiListCell from "@/components/plugin/list-cell";
 import TuiListView from "@/components/plugin/list-view";
 import TuiListView from "@/components/plugin/list-view";
 import AppActivilyCoupon from "@/components/module/app-activily-coupon";
 import AppActivilyCoupon from "@/components/module/app-activily-coupon";
-import { getNewShop } from "@/api/shop";
+import { getList } from "@/api/hd";
 import { share } from "@/mixins";
 import { share } from "@/mixins";
 import AppAvatarModule from "@/components/module/app-avatar";
 import AppAvatarModule from "@/components/module/app-avatar";
 import { mapGetters } from 'vuex'
 import { mapGetters } from 'vuex'
@@ -131,17 +131,17 @@ export default {
       this.$msg('升级中...')
       this.$msg('升级中...')
     },
     },
     bugFlower(item){
     bugFlower(item){
-      this.pageTo({ url:'/pages/item/item?account='+item.id})
+      this.pageTo({ url:'/pages/item/item?account='+item.shopId})
     },
     },
     bugHs(item){
     bugHs(item){
-      this.pageTo({ url:'/pages/home/category?account='+item.id})
+      this.pageTo({ url:'/pages/home/category?account='+item.shopId})
     },
     },
     init () {
     init () {
         this.getShopList()
         this.getShopList()
     },
     },
     getShopList(){
     getShopList(){
       let that = this
       let that = this
-      getNewShop().then(res=>{
+      getList().then(res=>{
         that.list = res.data.list
         that.list = res.data.list
         that.showGlInfo = res.data.showGlInfo
         that.showGlInfo = res.data.showGlInfo
       })
       })