From 94290006bb8da873bf118377af0b11237e06fb9b Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 20 Jan 2025 14:00:59 +0800
Subject: [PATCH 1/5] =?UTF-8?q?feat:=E6=B5=8B=E8=AF=95=E6=94=AF=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/test/login.vue      | 128 +++++++++++++++++-----------------
 src/pages/wallet/recharge.vue |   2 +-
 2 files changed, 66 insertions(+), 64 deletions(-)

diff --git a/src/pages/test/login.vue b/src/pages/test/login.vue
index 1155b89..76df790 100644
--- a/src/pages/test/login.vue
+++ b/src/pages/test/login.vue
@@ -1,83 +1,85 @@
 <script setup lang="ts">
-import { ref, reactive } from "vue";
-import { onLoad, onShow } from "@dcloudio/uni-app";
+import { ref, reactive } from "vue"
+import { onLoad, onShow } from "@dcloudio/uni-app"
 
-import { hooks, constant, router } from "@@/index";
-import { userApi } from "@@/api";
+import { hooks, constant, router } from "@@/index"
+import { userApi } from "@@/api"
 
-const data = {};
+const data = {}
 const state = reactive<any>({
-  userInfo: null,
-});
+	userInfo: null,
+})
 const applyForm = reactive<any>({
-  username: "",
-  password: "",
-});
+	username: "",
+	password: "",
+})
 const applyFormRules = reactive<any>({
-  username: [{ required: true, message: "请输入用户名" }],
-  password: [{ required: true, message: "请输入密码" }],
-});
+	username: [{ required: true, message: "请输入用户名" }],
+	password: [{ required: true, message: "请输入密码" }],
+})
 
-onLoad(() => { });
+onLoad(() => {})
 
 onShow(() => {
-  const userInfoKey = constant.storageConstant.USERINFO;
-  state.userInfo = uni.getStorageSync(userInfoKey);
-});
+	const userInfoKey = constant.storageConstant.USERINFO
+	state.userInfo = uni.getStorageSync(userInfoKey)
+})
 
-const applyFormRef = ref<any>(null);
+const applyFormRef = ref<any>(null)
 const doSubmit = async () => {
-  applyFormRef.value.submit();
-  const { isPass } = applyFormRef.value.validate();
-  if (!isPass) return;
-  const tokenKey = constant.storageConstant.TOKEN;
-  const userInfoKey = constant.storageConstant.USERINFO;
-  uni.removeStorageSync(tokenKey)
-  uni.showLoading({ title: "登录中...", mask: true });
-  const res = await userApi.login({
-    ...applyForm,
-    grant_type: 'password',
-    scope: 'server',
-  });
-  if (res.code != 0) {
-    uni.showToast({ title: res.msg + ",登录失败，请重新登录", icon: "error" });
-    return;
-  }
-  uni.setStorageSync(tokenKey, res.data);
-  const { data: userData } = await userApi.userInfo();
-  uni.setStorageSync(userInfoKey, userData);
-  uni.hideLoading();
-  uni.showToast({ title: "登录成功", icon: "none" });
-  router.back();
-};
+	applyFormRef.value.submit()
+	const { isPass } = applyFormRef.value.validate()
+	if (!isPass) return
+	const tokenKey = constant.storageConstant.TOKEN
+	const userInfoKey = constant.storageConstant.USERINFO
+	uni.removeStorageSync(tokenKey)
+	uni.showLoading({ title: "登录中...", mask: true })
+	const res = await userApi.login({
+		...applyForm,
+		grant_type: "password",
+		scope: "server",
+	})
+	if (res.code != 0) {
+		uni.showToast({ title: res.msg + ",登录失败，请重新登录", icon: "error" })
+		return
+	}
+	uni.setStorageSync(tokenKey, res.data)
+	const { data: userData } = await userApi.userInfo()
+	uni.setStorageSync(userInfoKey, userData)
+	uni.hideLoading()
+	uni.showToast({ title: "登录成功", icon: "none" })
+	router.back()
+}
 </script>
 
 <template>
-  <crud-layout title="登录" bg="/static/page/blue-bg.png">
-    <view class="h-30rpx" />
-    <view class="card p-x-30rpx p-y-40rpx">
-      <tm-form ref="applyFormRef" v-model="applyForm" :rules="applyFormRules" direction="vertical">
-        <tm-form-item name="username" label="用户名" :showBottom="false">
-          <tm-input v-model="applyForm.username" placeholder="请输入用户名.." />
-        </tm-form-item>
-        <view class="h-30rpx" />
-        <tm-form-item name="password" label="验证码" :showBottom="false">
-          <tm-input password showEye v-model="applyForm.password" placeholder="请输入用户密码.." />
-        </tm-form-item>
-      </tm-form>
-    </view>
-    <view v-if="state.detailType != 'view'"
-      class="bg-#0094ff p-y-20rpx text-center rounded-40rpx m-x-30rpx m-t-60rpx sub-text-30 color-white!"
-      @tap="doSubmit">
-      登录
-    </view>
-  </crud-layout>
+	<crud-layout title="登录" bg="/static/page/blue-bg.png">
+		<view class="h-30rpx" />
+		<view class="card p-x-30rpx p-y-40rpx">
+			<tm-form ref="applyFormRef" v-model="applyForm" :rules="applyFormRules" direction="vertical">
+				<tm-form-item name="username" label="用户名" :showBottom="false">
+					<tm-input v-model="applyForm.username" placeholder="请输入用户名.." />
+				</tm-form-item>
+				<view class="h-30rpx" />
+				<tm-form-item name="password" label="密码" :showBottom="false">
+					<tm-input password showEye v-model="applyForm.password" placeholder="请输入用户密码.." />
+				</tm-form-item>
+			</tm-form>
+		</view>
+		<view
+			v-if="state.detailType != 'view'"
+			class="bg-#0094ff p-y-20rpx text-center rounded-40rpx m-x-30rpx m-t-60rpx sub-text-30 color-white!"
+			@tap="doSubmit"
+		>
+			登录
+		</view>
+	</crud-layout>
 </template>
 
 <style lang="scss" scoped>
 :deep() {
-  .tmFormItemLabel {
-    padding-bottom: 10rpx !important;
-  }
+	.tmFormItemLabel {
+		padding-bottom: 10rpx !important;
+	}
 }
 </style>
diff --git a/src/pages/wallet/recharge.vue b/src/pages/wallet/recharge.vue
index 1b26eda..36b6627 100644
--- a/src/pages/wallet/recharge.vue
+++ b/src/pages/wallet/recharge.vue
@@ -8,7 +8,7 @@ import { walletApi, payApi } from "@@/api"
 
 const data = {
 	payType: [
-		{ text: "模拟支付", disabled: false, type: "0", value: "mock" },
+		// { text: "模拟支付", disabled: false, type: "0", value: "mock" },
 		{ text: "微信支付", disabled: true, type: "1", value: "wx_pub" },
 		{ text: "支付宝支付", disabled: true, type: "2", value: "alipay_wap" },
 	],

From 2e15506325e4636ef6cec0cce8e67924a2177059 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 20 Jan 2025 14:07:39 +0800
Subject: [PATCH 2/5] =?UTF-8?q?feat:=E6=94=AF=E4=BB=98=E6=96=B9=E5=BC=8F?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                          | 4 ++--
 src/pages/wallet/recharge.vue | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.env b/.env
index 531e670..8625bde 100644
--- a/.env
+++ b/.env
@@ -23,9 +23,9 @@ VITE_OAUTH2_APP_CLIENT='mini:mini'
 VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上
 
 # ******************** start 开发环境 start ********************
-VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
+# VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
 # VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/app-api
-# VITE_APP_DEV_SERVICE = http://192.168.101.29:9999 # 邓-本地
+VITE_APP_DEV_SERVICE = http://192.168.101.29:9999 # 邓-本地
 # VITE_APP_DEV_SERVICE = http://127.0.0.1:9999
 # VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api
 # VITE_APP_DEV_SERVICE = http://localhost:9999
diff --git a/src/pages/wallet/recharge.vue b/src/pages/wallet/recharge.vue
index 36b6627..a0ac185 100644
--- a/src/pages/wallet/recharge.vue
+++ b/src/pages/wallet/recharge.vue
@@ -16,7 +16,7 @@ const data = {
 
 const state = reactive<any>({
 	walletId: null,
-	currentPayType: "0",
+	currentPayType: null,
 	currentRecharge: 0,
 	userInfo: {},
 	detail: {},
@@ -56,6 +56,10 @@ const doPay = async () => {
 		uni.showToast({ title: "请选择充值金额", icon: "none" })
 		return
 	}
+	if (state.currentPayType == undefined) {
+		uni.showToast({ title: "请选择支付方式", icon: "none" })
+		return
+	}
 	try {
 		uni.showLoading({ title: "充值中...", mask: true })
 		const targetRecharge = state.rechargeList[state.currentRecharge]

From 751a09a2fc41ac2aeb0b6a62af68c276fa760356 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Tue, 21 Jan 2025 20:32:58 +0800
Subject: [PATCH 3/5] env

---
 .env | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.env b/.env
index 8625bde..b4fec09 100644
--- a/.env
+++ b/.env
@@ -20,7 +20,7 @@ VITE_OAUTH2_APP_CLIENT='mini:mini'
 #VITE_IMAGE_BASE_PATH = http://localhost:9999
 # VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地
 # VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # 张
-VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上
+VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api # 信创线上
 
 # ******************** start 开发环境 start ********************
 # VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
@@ -33,5 +33,6 @@ VITE_APP_DEV_SERVICE = http://192.168.101.29:9999 # 邓-本地
 
 # ******************** start 生产环境 start ********************
 #VITE_APP_PROD_SERVICE = http://123.156.228.134:48080/app-api
-VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api
+#VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api
+VITE_APP_PROD_SERVICE = https://stgl.pj.gov.cn/api
 # ******************** end 生产环境 end ********************

From 8e9ed479ba7fc2cbfd7e94ba682f281b3b852275 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 22 Jan 2025 19:12:28 +0800
Subject: [PATCH 4/5] =?UTF-8?q?feat:=E6=98=BE=E7=A4=BA=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                    | 37 -------------------------------------
 src/pages/tabbar/my.vue |  5 +++--
 2 files changed, 3 insertions(+), 39 deletions(-)
 delete mode 100644 .env

diff --git a/.env b/.env
deleted file mode 100644
index 8625bde..0000000
--- a/.env
+++ /dev/null
@@ -1,37 +0,0 @@
-#是否是TOC应用
-VITE_IS_TOC=true
-
-#是否是H5模式
-VITE_IS_H5=true
-
-#是否是微服务架构
-VITE_IS_MICRO=true
-
-# 后端请求前缀
-VITE_API_URL = /api
-
-# 前端加密密钥
-VITE_PWD_ENC_KEY='pigxpigxpigxpigx'
-
-# OAUTH2 APP模式客户端信息
-VITE_OAUTH2_APP_CLIENT='mini:mini'
-
-# 图片访问基础地址
-#VITE_IMAGE_BASE_PATH = http://localhost:9999
-# VITE_IMAGE_BASE_PATH = http://192.168.101.29:9999 # 邓-本地
-# VITE_IMAGE_BASE_PATH = http://pjcloud.center.takin.cc # 张
-VITE_IMAGE_BASE_PATH = http://59.202.170.152:81/api # 信创线上
-
-# ******************** start 开发环境 start ********************
-# VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
-# VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/app-api
-VITE_APP_DEV_SERVICE = http://192.168.101.29:9999 # 邓-本地
-# VITE_APP_DEV_SERVICE = http://127.0.0.1:9999
-# VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api
-# VITE_APP_DEV_SERVICE = http://localhost:9999
-# ******************** end 开发环境 end ********************
-
-# ******************** start 生产环境 start ********************
-#VITE_APP_PROD_SERVICE = http://123.156.228.134:48080/app-api
-VITE_APP_PROD_SERVICE = http://59.202.170.152:81/api
-# ******************** end 生产环境 end ********************
diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue
index 86c1b1d..610b7c2 100644
--- a/src/pages/tabbar/my.vue
+++ b/src/pages/tabbar/my.vue
@@ -3,6 +3,8 @@ import { ref, reactive } from "vue"
 import { onLoad, onShow } from "@dcloudio/uni-app"
 import { isEmpty } from "radash"
 
+import { filePath } from "@@/utils/file"
+
 import { hooks, router, constant } from "@@/index"
 import { merchantApi, userApi, walletApi } from "@@/api"
 
@@ -55,7 +57,6 @@ const getUserInfo = () => {
 	const userStorage = uni.getStorageSync(userInfoKey)
 	if (!isEmpty(userStorage)) {
 		state.userInfo = userStorage
-		console.log(state.userInfo, "state.userInfo")
 	}
 }
 
@@ -132,7 +133,7 @@ const doLogout = async () => {
 			<image
 				class="w-100rpx h-100rpx rounded-full"
 				v-if="state.userInfo?.sysUser?.avatar"
-				:src="state.userInfo.sysUser.avatar"
+				:src="filePath(state.userInfo.sysUser.avatar)"
 				mode="aspectFill"
 			/>
 			<image class="w-100rpx h-100rpx rounded-full" v-else src="/static/icon/default-avatar.png" mode="aspectFill" />

From c3eaafa5d0575ebd0fa74be0180c5cfe8a9901ea Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 23 Jan 2025 17:01:27 +0800
Subject: [PATCH 5/5] =?UTF-8?q?feat=EF=BC=9A=E9=80=80=E6=AC=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env                       |   4 +-
 src/pages/refund/apply.vue | 323 ++++++++++++++++++++-----------------
 2 files changed, 173 insertions(+), 154 deletions(-)

diff --git a/.env b/.env
index b4fec09..a11ed18 100644
--- a/.env
+++ b/.env
@@ -25,8 +25,8 @@ VITE_IMAGE_BASE_PATH = https://stgl.pj.gov.cn/api # 信创线上
 # ******************** start 开发环境 start ********************
 # VITE_APP_DEV_SERVICE = http://59.202.170.152:81/api # 信创线上
 # VITE_APP_DEV_SERVICE = https://stgl.pj.gov.cn/app-api
-VITE_APP_DEV_SERVICE = http://192.168.101.29:9999 # 邓-本地
-# VITE_APP_DEV_SERVICE = http://127.0.0.1:9999
+# VITE_APP_DEV_SERVICE = http://192.168.101.29:9999 # 邓-本地
+VITE_APP_DEV_SERVICE = http://127.0.0.1:9999
 # VITE_APP_DEV_SERVICE = http://123.156.230.15:8089/api
 # VITE_APP_DEV_SERVICE = http://localhost:9999
 # ******************** end 开发环境 end ********************
diff --git a/src/pages/refund/apply.vue b/src/pages/refund/apply.vue
index 4480179..f563040 100644
--- a/src/pages/refund/apply.vue
+++ b/src/pages/refund/apply.vue
@@ -1,188 +1,207 @@
 <script setup lang="ts">
-import { ref, reactive } from "vue";
-import { onLoad, onShow } from "@dcloudio/uni-app";
+import { ref, reactive } from "vue"
+import { onLoad, onShow } from "@dcloudio/uni-app"
 import { isEmpty } from "radash"
 
 import { hooks, router } from "@@/index"
 import { orderApi, refundApi, commonApi } from "@@/api"
 
-import { filePath } from "@@/utils/file";
+import { filePath } from "@@/utils/file"
 
 const data = {
-    payType: [
-        { text: "仅退款", disabled: false, visible: true, type: "10", value: "10" },
-        { text: "退款退货", disabled: true, visible: false, type: "20", value: "20" },
-    ]
+	payType: [
+		{ text: "仅退款", disabled: false, visible: true, type: "10", value: "10" },
+		{ text: "退款退货", disabled: true, visible: false, type: "20", value: "20" },
+	],
 }
 const state = reactive<any>({
-    detailId: null,
-    detail: {},
-    shopCarList: [],
-    setting: {},
-    selectList: []
+	detailId: null,
+	detail: {},
+	shopCarList: [],
+	setting: {},
+	selectList: [],
 })
 
 const applyForm = reactive<any>({
-    way: data.payType[0].type,
-    remark: "",
-    reason: "",
-    reasonStr: "",
+	way: data.payType[0].type,
+	remark: "",
+	reason: "",
+	reasonStr: "",
 })
 
 onLoad((options: any) => {
-    if (!isEmpty(options.id)) {
-        state.detailId = options.id
-    }
-});
+	if (!isEmpty(options.id)) {
+		state.detailId = options.id
+	}
+})
 onShow(() => {
-    getDetail()
-    getSetting()
-    getShopCarList()
+	getDetail()
+	getSetting()
+	getShopCarList()
 })
 
 const getSetting = async () => {
-    const _pa = {};
-    const { data } = await commonApi.setting(_pa)
-    state.setting = data
-    state.selectList = data.afterSaleRefundReasons?.split(",").map(v => {
-        return {
-            id: v,
-            title: v,
-        }
-    })
+	const _pa = {}
+	const { data } = await commonApi.setting(_pa)
+	state.setting = data
+	state.selectList = data.afterSaleRefundReasons?.split(",").map((v) => {
+		return {
+			id: v,
+			title: v,
+		}
+	})
 }
 const getDetail = async () => {
-    if (isEmpty(state.detailId)) return
-    const _pa = { id: state.detailId };
-    const { data } = await orderApi.detail(_pa)
-    state.detail = data
+	if (isEmpty(state.detailId)) return
+	const _pa = { id: state.detailId }
+	const { data } = await orderApi.detail(_pa)
+	state.detail = data
 }
 const getShopCarList = async () => {
-    if (isEmpty(state.detailId)) return
-    const _pa = { orderId: state.detailId };
-    const { data } = await orderApi.shopCarList(_pa)
-    state.shopCarList = data
+	if (isEmpty(state.detailId)) return
+	const _pa = { orderId: state.detailId }
+	const { data } = await orderApi.shopCarList(_pa)
+	state.shopCarList = data
 }
 
 const radioChange = (e: any) => {
-    switch (e) {
-        case "10":
-            state.selectList = state.setting.afterSaleRefundReasons.map(v => {
-                return {
-                    id: v,
-                    title: v,
-                }
-            })
-            break
-        case "20":
-            state.selectList = state.setting.afterSaleReturnReasons.map(v => {
-                return {
-                    id: v,
-                    title: v,
-                }
-            })
-            break
-    }
+	switch (e) {
+		case "10":
+			state.selectList = state.setting.afterSaleRefundReasons.map((v) => {
+				return {
+					id: v,
+					title: v,
+				}
+			})
+			break
+		case "20":
+			state.selectList = state.setting.afterSaleReturnReasons.map((v) => {
+				return {
+					id: v,
+					title: v,
+				}
+			})
+			break
+	}
 }
 
 const doSubmit = async () => {
-    if (isEmpty(applyForm.reasonStr)) {
-        uni.showToast({ title: '请选择申请原因', icon: "none" });
-        return
-    }
-    const _pa = {
-        way: applyForm.way,
-        refundPrice: state.detail.practicalTotalPrice,
-        orderId: state.detailId,
-        images: [],
-        applyReason: applyForm.reasonStr,
-        applyDescription: applyForm.remark,
-    }
-    try {
-        uni.showLoading({ title: '申请中...', mask: false });
-        const data = await refundApi.create(_pa)
-        uni.hideLoading()
-        uni.showToast({ title: '申请成功', icon: "none" });
-        router.jump("/pages/order/detail", { id: state.detailId }, 2)
-    } catch (error) {
-        console.error(error);
-        uni.hideLoading()
-    }
+	if (isEmpty(applyForm.reasonStr)) {
+		uni.showToast({ title: "请选择申请原因", icon: "none" })
+		return
+	}
+	const _pa = {
+		way: applyForm.way,
+		refundPrice: state.detail.practicalTotalPrice,
+		orderId: state.detailId,
+		images: [],
+		applyReason: applyForm.reasonStr,
+		applyDescription: applyForm.remark,
+	}
+	try {
+		uni.showLoading({ title: "申请中...", mask: false })
+		const data = await refundApi.create(_pa)
+		uni.hideLoading()
+		uni.showToast({ title: "申请成功", icon: "none" })
+		router.jump("/pages/order/detail", { id: state.detailId }, 2)
+	} catch (error) {
+		console.error(error)
+		uni.hideLoading()
+	}
 }
-
 </script>
 
-
 <template>
-    <crud-layout title="申请售后" mainIsScroll bg="/static/page/blue-bg.png">
-        <view class="h-30rpx" />
-        <view class="flex-col justify-center card p-x-20rpx p-y-30rpx m-b-20rpx">
-            <view class="m-t-15rpx">
-                <view class="flex-row items-start justify-between" v-for="(v, i) in state.shopCarList" :key="i"
-                    @tap.stop="router.jump('/pages/merchant/product-detail', { id: v.productId })">
-                    <view class="flex-row items-center">
-                        <image class="w-160rpx h-160rpx rounded-8rpx" :src="filePath(v.productPic)" mode="aspectFill" />
-                        <view class="flex-col m-l-15rpx second-text-26">
-                            <view class="sub-text-28">{{ v.productName }}</view>
-                            <view class="m-t-5rpx">¥ {{ hooks.useMoney(v.productPrice) }}</view>
-                            <view class="m-t-5rpx">x {{ v.productCount }}</view>
-                        </view>
-                    </view>
-                    <view class="flex-row-center">
-                        <view class="sub-text-32">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
-                    </view>
-                </view>
-                <view class="m-y-15rpx h-1px bg-#999 bg-opacity-5" />
-                <view class="flex-row items-center justify-between">
-                    <view class="sub-text-28">实付款</view>
-                    <view class="flex-row items-end">
-                        <view class="sub-text-28">¥</view>
-                        <view class="m-l-5rpx sub-text-28">{{ hooks.useMoney(state.detail.payPrice) }}</view>
-                    </view>
-                </view>
-            </view>
-        </view>
-        <view class="card p-x-20rpx p-y-30rpx m-b-20rpx">
-            <view class="sub-text-28">售后类型</view>
-            <view class="m-t-20rpx">
-                <tm-radio-group @change="radioChange" direction="column" gap="20" v-model="applyForm.way">
-                    <tm-radio :disabled="v.disabled" v-for="(v, i) in data.payType" :key="i" v-show="v.visible"
-                        :value="v.type" :label="v.text" />
-                </tm-radio-group>
-            </view>
-        </view>
-        <view class="flex-row items-center justify-between card p-x-20rpx p-y-30rpx m-b-20rpx">
-            <view class="sub-text-28">退款金额</view>
-            <view class="sub-text-28 color-red!">¥{{ hooks.useMoney(state.detail.payPrice) }}</view>
-        </view>
-        <view class="card p-x-20rpx p-y-30rpx m-b-20rpx">
-            <tm-picker rang-key="title" rang-text="title" v-model="applyForm.reason"
-                v-model:model-str="applyForm.reasonStr" :list="state.selectList">
-                <view class="flex-row items-center justify-between">
-                    <view class="sub-text-28">申请原因</view>
-                    <view class="flex-row items-center second-text-24">
-                        <text>{{ applyForm.reasonStr || '请选择申请原因' }} </text>
-                        <text class="m-l-10rpx color-#b1b1b1 iconfont icon-xiangxiajiantouxiao" />
-                    </view>
-                </view>
-            </tm-picker>
-        </view>
-        <view class="flex-col justify-center card p-x-20rpx p-y-30rpx m-b-20rpx">
-            <view class="sub-text-28">相关描述</view>
-            <view class="m-t-20rpx">
-                <tm-input v-model="applyForm.remark" type="textarea" :showClear="false"
-                    placeholder="客官～请描述您遇到的问题"></tm-input>
-            </view>
-        </view>
-        <view class="h-30rpx" />
-        <template #main-bottom>
-            <view v-if="state.detailType != 'view'"
-                class="bg-#0094ff p-y-20rpx text-center rounded-40rpx m-x-30rpx m-y-30rpx sub-text-30 color-white!"
-                @tap="doSubmit">
-                提交申请
-            </view>
-        </template>
-    </crud-layout>
+	<crud-layout title="申请售后" mainIsScroll bg="/static/page/blue-bg.png">
+		<view class="h-30rpx" />
+		<view class="flex-col justify-center card p-x-20rpx p-y-30rpx m-b-20rpx">
+			<view class="m-t-15rpx">
+				<view
+					class="flex-row items-start justify-between"
+					v-for="(v, i) in state.shopCarList"
+					:key="i"
+					@tap.stop="router.jump('/pages/merchant/product-detail', { id: v.productId })"
+				>
+					<view class="flex-row items-center">
+						<image class="w-160rpx h-160rpx rounded-8rpx" :src="filePath(v.productPic)" mode="aspectFill" />
+						<view class="flex-col m-l-15rpx second-text-26">
+							<view class="sub-text-28">{{ v.productName }}</view>
+							<view class="m-t-5rpx">¥ {{ hooks.useMoney(v.productPrice) }}</view>
+							<view class="m-t-5rpx">x {{ v.productCount }}</view>
+						</view>
+					</view>
+					<view class="flex-row-center">
+						<view class="sub-text-32">¥ {{ hooks.useMoney(v.totalPrice) }}</view>
+					</view>
+				</view>
+				<view class="m-y-15rpx h-1px bg-#999 bg-opacity-5" />
+				<view class="flex-row items-center justify-between">
+					<view class="sub-text-28">实付款</view>
+					<view class="flex-row items-end">
+						<view class="sub-text-28">¥</view>
+						<view class="m-l-5rpx sub-text-28">{{ hooks.useMoney(state.detail.payPrice) }}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="card p-x-20rpx p-y-30rpx m-b-20rpx">
+			<view class="sub-text-28">售后类型</view>
+			<view class="m-t-20rpx">
+				<tm-radio-group @change="radioChange" direction="column" gap="20" v-model="applyForm.way">
+					<tm-radio
+						:disabled="v.disabled"
+						v-for="(v, i) in data.payType"
+						:key="i"
+						v-show="v.visible"
+						:value="v.type"
+						:label="v.text"
+					/>
+				</tm-radio-group>
+			</view>
+		</view>
+		<view class="flex-row items-center justify-between card p-x-20rpx p-y-30rpx m-b-20rpx">
+			<view class="sub-text-28">退款金额</view>
+			<view class="sub-text-28 color-red!">¥{{ hooks.useMoney(state.detail.payPrice) }}</view>
+		</view>
+		<view class="card p-x-20rpx p-y-30rpx m-b-20rpx">
+			<tm-picker
+				rang-key="title"
+				rang-text="title"
+				v-model="applyForm.reason"
+				v-model:model-str="applyForm.reasonStr"
+				:list="state.selectList"
+			>
+				<view class="flex-row items-center justify-between">
+					<view class="sub-text-28">申请原因</view>
+					<view class="flex-row items-center second-text-24">
+						<text>{{ applyForm.reasonStr || "请选择申请原因" }} </text>
+						<text class="m-l-10rpx color-#b1b1b1 iconfont icon-xiangxiajiantouxiao" />
+					</view>
+				</view>
+			</tm-picker>
+		</view>
+		<view class="flex-col justify-center card p-x-20rpx p-y-30rpx m-b-20rpx">
+			<view class="sub-text-28">相关描述</view>
+			<view class="m-t-20rpx">
+				<tm-input
+					v-model="applyForm.remark"
+					type="textarea"
+					:showClear="false"
+					placeholder="客官～请描述您遇到的问题"
+				></tm-input>
+			</view>
+		</view>
+		<view class="h-30rpx" />
+		<template #main-bottom>
+			<view
+				v-if="state.detailType != 'view'"
+				class="bg-#0094ff p-y-20rpx text-center rounded-40rpx m-x-30rpx m-y-30rpx sub-text-30 color-white!"
+				@tap="doSubmit"
+			>
+				提交申请
+			</view>
+		</template>
+	</crud-layout>
 </template>
 
-<style lang="scss" scoped></style>
\ No newline at end of file
+<style lang="scss" scoped></style>