预订

ghsApp/src/admin/billing/affirm.vue

@@ -177,8 +177,7 @@
       </view>
       <text style="font-size:30upx;right:100upx;">
       当前在
-      <text v-if="currentShop && currentShop.default != 1"
-      style="font-weight:bold;color:red;margin-left:6upx;font-size:38upx;">{{currentShop.shopName}}</text></text>
+      <text style="font-weight:bold;color:red;margin-left:6upx;font-size:38upx;">{{currentShop.shopName}}</text></text>
       <button class="admin-button-com blue big" @click="confirmSubmit">提交</button>
     </view>
 

ghsApp/src/admin/expend/addExpend.vue

@@ -33,9 +33,9 @@
               <textarea v-model="form.remark" @focus="form.remark=''" style="height:80upx;" class="tui-textarea remark" name="remark" placeholder-class="phcolor" placeholder="选填" />
             </view>
           </tui-list-cell>
-
         </view>
         <view class="confirm-btn">
+          <view style="margin-bottom:20upx;font-size:33upx;color:red;font-weight:bold;">当前在：{{shopInfo.shopName}}</view>
           <button class="admin-button-com big blue" formType="submit">添加</button>
         </view>
       </form>
@@ -45,6 +45,7 @@
 <script>
 import TuiListCell from "@/components/plugin/list-cell";
 import { addExpend} from '@/api/expend'
+import {currentShop} from "@/api/shop";
 export default {
   name: "addExpend",
   components: {
@@ -60,9 +61,15 @@ export default {
         payWay:0
       },
       payWayList:[{name:"客服微信",id:0},{name:"现金",id:4},{name:"支付宝",id:1},{name:"银行卡",id:5}],
-      payWayindex:0
+      payWayindex:0,
+      shopInfo:{shopName:''}
     };
   },
+  onLoad () {
+			currentShop().then(res => {
+				this.shopInfo = res.data
+			})
+  },
   methods: {
 		payWayChange(e){
 			let index = e.detail.value

ghsApp/src/admin/expend/addSalary.vue

@@ -17,7 +17,10 @@
 						</view>
 					</view>
 				</view>
-				<view style="text-align:center;"> <button class="admin-button-com blue big" style="width:500upx;" @click="sendAmount">提交</button> </view>
+				<view style="text-align:center;">
+					<view style="margin-bottom:20upx;font-size:33upx;color:red;font-weight:bold;">当前在：{{shopInfo.shopName}}</view>
+					<button class="admin-button-com blue big" style="width:500upx;" @click="sendAmount">提交</button>
+				</view>
 			</block>
 			<block v-else>
 				<app-wrapper-empty title="暂无数据" :is-empty="$util.isEmpty(list.data)" />
@@ -36,6 +39,7 @@ import { list } from '@/mixins'
 import { mapGetters } from "vuex"
 import { getStaffList} from '@/api/staff'
 import { addSalary} from '@/api/expend'
+import {currentShop} from "@/api/shop";
 export default {
 	name: 'addSalary',
 	components: {
@@ -49,7 +53,7 @@ export default {
 	mixins: [list],
 	data() {
 		return {
-
+      		shopInfo:{shopName:''}
 		}
 	},
 	onPullDownRefresh() {
@@ -70,7 +74,10 @@ export default {
 			uni.stopPullDownRefresh()
 		}
 	},
-	onLoad: function() {
+	onLoad() {
+		currentShop().then(res => {
+			this.shopInfo = res.data
+		})
 	},
 	methods: {
 		async init() {