shish 2 лет назад
Родитель
Сommit
a790b7df7a

+ 4 - 2
ghsApp/src/admin/item/add.vue

@@ -10,8 +10,10 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">平台名称</div>
-          <view style="color:#CCCCCC;width:450upx;height:45upx;" @click.stop="notModify">{{form.name}}</view>
+          <div class="tui-title">初始名称</div>
+          <view style="color:#CCCCCC;width:450upx;height:45upx;" @click.stop="notModify">
+            {{form.name}}
+          </view>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">

+ 4 - 2
ghsApp/src/admin/item/copy.vue

@@ -9,8 +9,10 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">平台名称</view>
-          <view style="color:#CCCCCC;width:450upx;height:45upx;" @click.stop="notModify">{{form.name}}</view>
+          <view class="tui-title">初始名称</view>
+          <view style="color:#CCCCCC;width:450upx;height:45upx;" @click.stop="notModify">
+            {{form.name}}
+          </view>
           
         </tui-list-cell>
 

+ 5 - 2
ghsApp/src/admin/item/detail.vue

@@ -10,8 +10,11 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">平台名称</view>
-          <view style="color:#CCCCCC;width:450upx;height:45upx;" @click.stop="notModify">{{productData.ptItemInfo ? productData.ptItemInfo.name : ''}}</view>
+          <view class="tui-title">初始名称</view>
+          <view style="color:#CCCCCC;width:450upx;height:45upx;display:flex;align-items:center;" @click.stop="notModify">
+            {{productData.ptItemInfo ? productData.ptItemInfo.name : ''}}
+            <image :src="`${constant.imgUrl}/icon/official8.png`" v-if="productData.auth == 1" mode="widthFix" style="width:38upx;height:38upx;display:inline-block;margin-left:10upx;"></image>
+          </view>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">

+ 9 - 7
ghsApp/src/admin/shop/changeShop.vue

@@ -13,6 +13,13 @@
 							<t-th>花店数</t-th>
 							<t-th>操作</t-th>
 						</t-tr>
+						<t-tr>
+							<t-td><view style="width:180upx;font-weight:bold;color:black;">合计</view></t-td>
+							<t-td><view style="font-weight:bold;color:black;">{{shopData.totalSale}}</view></t-td>
+							<t-td><view style="font-weight:bold;color:black;">{{shopData.totalBalance}}</view></t-td>
+							<t-td><view style="font-weight:bold;color:black;">{{shopData.totalShopNum}}</view></t-td>
+							<t-td><view style="font-weight:bold;color:black;"></view></t-td>
+						</t-tr>
 						<t-tr v-for="(item, inIndex) in shopData.list" :key="inIndex">
 							<t-td>
 								<view style="width:180upx;">
@@ -27,13 +34,6 @@
 							<t-td><view>{{item.shopNum}}</view></t-td>
 							<t-td><button class="admin-button-com mini-btn blue" style="margin-left:30upx;" @click="changeShop(item.id)">选择</button></t-td>
 						</t-tr>
-						<t-tr>
-							<t-td><view style="width:180upx;font-weight:bold;color:black;">合计</view></t-td>
-							<t-td><view style="font-weight:bold;color:black;">{{shopData.totalSale}}</view></t-td>
-							<t-td><view style="font-weight:bold;color:black;">{{shopData.totalBalance}}</view></t-td>
-							<t-td><view style="font-weight:bold;color:black;">{{shopData.totalShopNum}}</view></t-td>
-							<t-td><view style="font-weight:bold;color:black;"></view></t-td>
-						</t-tr>
 					</t-table>
 				</block>
 			</view>
@@ -59,7 +59,9 @@ export default {
 	},
 	methods: {
 		showAllShop(){
+			uni.showLoading()
 			getPtGhsShop({pageSize:100}).then(res=>{
+				uni.hideLoading()
 				this.shopData = res.data
 			})
 		},