Merge branch 'ymf' of https://newgitea.sxczgkj.cn/czg_team/cashier_app into new_gyq

pageRecharge/components/recharge-item.vue

@@ -13,8 +13,8 @@
 				{{ returnSendStr.join('、') }}
 			</text>
 		</view>
-		<view class="u-flex u-row-right u-m-t-32 gap-20">
-			<view class="" style="width: 140rpx">
+		<view class="u-flex u-row-right u-m-t-32 gap-20" v-if="isCanEdit">
+			<view class="" style="width: 140rpx;">
 				<my-button plain height="56" type="cancel" shape="circle" @tap="del">删除</my-button>
 			</view>
 			<view class="" style="width: 140rpx">
@@ -25,9 +25,8 @@
 </template>
 
 <script setup>
-import { computed } from 'vue';
 import go from '@/commons/utils/go.js';
-import myButton from '@/components/my-components/my-button.vue';
+import myButton from '@/components/my-components/my-button.vue'
 const props = defineProps({
 	index: {
 		type: Number,
@@ -36,10 +35,14 @@ const props = defineProps({
 	data: {
 		type: Object,
 		default: () => {
-			return {};
+			return {}
 		}
+	},
+	isCanEdit: {
+		type: Boolean,
+		default: false
 	}
-});
+})
 const emits = defineEmits(['del']);
 function del() {
 	emits('del', {

pageRecharge/index.vue

@@ -17,7 +17,7 @@
 
 			<view class="u-p-30">
 				<view class="u-m-b-32" v-for="(item, index) in rechargeLists" :key="index">
-					<recharge-item @del="rechargeItemDel" :index="index" :data="item"></recharge-item>
+					<recharge-item @del="rechargeItemDel" :index="index" :data="item" :isCanEdit="isCanEdit"></recharge-item>
 				</view>
 			</view>
 		</template>
@@ -67,7 +67,7 @@
 						<my-switch v-model="mustBindPhone"></my-switch>
 					</view>
 				</view> -->
-				<view class="u-m-t-60" style="padding: 80rpx">
+				<view class="u-m-t-60" style="padding: 80rpx" v-if="isCanEdit">
 					<my-button showShadow shape="circle" @click="rechargeSetting">保存</my-button>
 				</view>
 			</view>
@@ -92,8 +92,13 @@ import rechargeItem from './components/recharge-item.vue';
 import rechargeRecord from './components/rechargeRerord.vue';
 import $util from '@/commons/utils/getDateArea.js';
 import go from '@/commons/utils/go.js';
-import { shopRechargePost, shopRechargeGet, shopUserFlow } from '@/http/api/market/index.js';
-import { onShow } from '@dcloudio/uni-app';
+import { shopRechargePost, shopRechargeGet } from '@/http/api/market/index.js';
+import { onLoad } from '@dcloudio/uni-app';
+import { isMainShop } from "@/store/account.js";
+
+const isCanEdit=computed(()=>{
+	return isMainShop()
+})
 
 const model = ref(null);
 const modelData = reactive({