Merge remote-tracking branch 'origin/master'

fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue

@@ -3924,7 +3924,7 @@
         this.map.authCode = this.authCode;
         this.map.allAmount = +this.oilActualPay + +this.goodsActualPay
         this.map.consumeAmount = this.consumeAmount;
-        this.updateRefuelMoney();
+        if (this.consumeRefuelMoney>0) this.updateRefuelMoney();
         this.map.refuelMoney = JSON.stringify(this.refuelMoney)
         this.map.couponId = this.useCouponIds
         if (this.staff) {

gasStation-uni/pages/index/index.vue

@@ -102,10 +102,10 @@
 
 					<view class="station-title" style="display: flex;justify-content: space-between;">
 						{{store.name}}{{store.description ? "("+store.description+")" : ""}}
-						<view class="" @click="goChooseAddress" style="width: 22%;font-size: 14px;font-weight: 400;">
+						<!-- <view class="" @click="goChooseAddress" style="width: 22%;font-size: 14px;font-weight: 400;">
 							<view style="font-size: 12px;">切换位置 <uni-icons type="right" color="#304fff"
 									size="14"></uni-icons> </view>
-						</view>
+						</view> -->
 					</view><!--顺通石化加油站(工业南路站)-->
 					<view style="display: flex;">
 						<view class="bule-icon" v-if="welfare.length!=0" v-for="(item,index) in welfare" :key="index">