代码合并

pages/index/index.vue

@@ -229,7 +229,7 @@
 		
 		{
 			title: '退出登录',
-			icon: '/static/indexImg/PAGE_SALES_SUMMARY.svg',
+			icon: '/static/indexImg/icon-login-out.svg',
 			pageUrl: 'PAGES_LOGIN',
 			clickFunc:()=>{
 				storageManage.cleanByLogout()

pages/login/index.vue

@@ -259,10 +259,12 @@
 
 	function accountTypeChange(e) {
 		// #ifdef H5
-		if (e == 1) {
+		if(e==1){
-			// vdata.formData.merchantName = '18049104914'
+			vdata.formData.merchantName = '18049104914'
-			// vdata.formData.merchantName = ''
+			vdata.formData.username = '13666666666'
-			// vdata.formData.username = ''
+			vdata.formData.pwd = '123456'
+		}else{
+			vdata.formData.pwd = 'qwer1234'
 		}
 		// #endif
 	}

pagesCreateOrder/index/index.vue

@@ -158,7 +158,6 @@
 		reactive,
 		ref,
 		nextTick,
-		getCurrentInstance,
 		watch
 	} from 'vue';
 	import myCar from './components/car'
@@ -179,7 +178,6 @@
 		canXiadan.value=await hasPermission('允许下单')
 	}
 	xiadanClick()
-	const instance = getCurrentInstance();
 	//临时菜
 	const lingshi = reactive({
 		show: false

pagesOrder/detail/components/extra.vue

@@ -5,7 +5,7 @@
 			<template v-if="orderInfo.status=='unpaid'&&data.status!='return'">
 				<my-button plain shape="circle" :width="160" :height="56" @click="tuicai">退菜</my-button>
 			</template>
-			<template v-if="orderInfo.status=='closed'">
+			<template v-if="orderInfo.status=='closed'&&data.status!='return'">
 				<my-button plain shape="circle" :width="160" :height="56"  @click="tuikuan">退款</my-button>
 			</template>
 		</view>

pagesOrder/detail/components/list.vue

@@ -60,12 +60,15 @@
 								@tap="tuicai(item,index)"><text class="no-wrap">退菜</text></my-button>
 						</view>
 					</template>
-					<template v-if="orderInfo.status=='closed'">
+					<template v-if="item.status!='refund'">
-						<view class="u-flex u-row-right gap-20 u-m-t-20" v-if="item.status!='return'">
+						<template v-if="orderInfo.status=='closed'||orderInfo.status=='refund'">
-							<my-button :width="128" :height="48" plain shape="circle"
+							<view class="u-flex u-row-right gap-20 u-m-t-20" v-if="item.status!='return'">
-								@tap="tuikuan(item,index)"><text class="no-wrap">退款</text> </my-button>
+								<my-button :width="128" :height="48" plain shape="circle"
-						</view>
+									@tap="tuikuan(item,index)"><text class="no-wrap">退款</text> </my-button>
+							</view>
+						</template>
 					</template>
+					
 				</view>
 			</view>
 			<!-- <view class="bg-gray u-p-20 u-m-t-20" v-if="orderInfo.remark">
@@ -134,6 +137,7 @@
 		computed
 	} from 'vue';
 	import color from '@/commons/color.js'
+	import {hasPermission} from '@/commons/utils/hasPermission.js'
 	const emits = defineEmits(['tuicai', 'tuikuan', 'printOrder'])
 	
 	function returnTotalMoney(item){
@@ -151,7 +155,11 @@
 	}
 
 	function tuikuan(item, index) {
-		emits('tuikuan', item, index)
+		hasPermission('允许退款').then(res=>{
+			if(res){
+				emits('tuikuan', item, index)
+			}
+		})
 	}
 
 	function printOrder() {

static/indexImg/icon-login-out.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1729662523365" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4294" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M512 493.568c-32.256 0-58.88-26.112-58.88-58.88V58.88C453.12 26.112 479.744 0 512 0s58.88 26.112 58.88 58.88v375.808c0 32.256-26.624 58.88-58.88 58.88z" fill="#318AFE" p-id="4295"></path><path d="M512 1024c-273.92 0-496.64-222.72-496.64-496.64 0-202.752 121.344-382.976 309.248-459.776 30.208-12.288 64.512 2.048 76.8 32.256 12.288 30.208-2.048 64.512-32.256 76.8C225.792 235.008 133.12 372.736 133.12 527.36c0 208.896 169.984 378.88 378.88 378.88s378.88-169.984 378.88-378.88c0-154.624-92.672-292.352-236.032-351.232-30.208-12.288-44.544-46.592-32.256-76.8 12.288-30.208 46.592-44.544 76.8-32.256 187.904 76.8 309.248 257.024 309.248 459.776 0 274.432-222.72 497.152-496.64 497.152z" fill="#318AFE" p-id="4296"></path></svg>