shish 2 ani în urmă
părinte
comite
43c798044a
1 a modificat fișierele cu 12 adăugiri și 5 ștergeri
  1. 12 5
      ghsApp/src/admin/shop/changeShop.vue

+ 12 - 5
ghsApp/src/admin/shop/changeShop.vue

@@ -1,7 +1,7 @@
 <template>
 <view class="app-content">
 	<view class="ex-page">
-		<view class="top-bar" style="margin-left:100upx;" @click="showIncome">有收入</view>
+		<view class="top-bar" style="margin-left:100upx;" @click="showAllShop">显示全部</view>
 		<scroll-view scroll-y scroll-with-animation class="main-view">
 			<view class="space-view ex-table">
 				<block>
@@ -14,7 +14,14 @@
 							<t-th>操作</t-th>
 						</t-tr>
 						<t-tr v-for="(item, inIndex) in shopData.list" :key="inIndex">
-							<t-td><view style="width:180upx;">{{item.merchantName}}<br />{{item.shopName}}</view></t-td>
+							<t-td>
+								<view style="width:180upx;">
+									<view>{{item.merchantName}}</view>
+									<block v-if="item.shopName && item.shopName !='首店'">
+										<view>{{item.shopName}}</view>
+									</block>
+								</view>
+							</t-td>
 							<t-td><view>{{item.todaySale}}</view></t-td>
 							<t-td><view>{{item.balance}}</view></t-td>
 							<t-td><view>{{item.shopNum}}</view></t-td>
@@ -51,13 +58,13 @@ export default {
 		};
 	},
 	methods: {
-		showIncome(){
-			getPtGhsShop({hasSale:1}).then(res=>{
+		showAllShop(){
+			getPtGhsShop().then(res=>{
 				this.shopData = res.data
 			})
 		},
 		init(){
-			getPtGhsShop().then(res=>{
+			getPtGhsShop({hasSale:1}).then(res=>{
 				this.shopData = res.data
 			})
 		},