Merge branch 'develop' of https://gitee.com/qinxingxing/alpha-shopping into develop

api/order.js

@@ -103,3 +103,39 @@ export function getMiniProgramSignUrl(data) {
 		data,
 	});
 }
+
+// 售后申请
+export function afterSaleApply(data) {
+	return request({
+		url: "/order/afterApply",
+		method: "post",
+		data,
+	});
+}
+
+// 售后订单详情
+export function afterSaleDetail(data) {
+	return request({
+		url: "/order/getAfterDetail",
+		method: "get",
+		data,
+	});
+}
+
+// 撤销售后申请
+export function cancelAfterSale(data) {
+	return request({
+		url: "/order/cancelAfterApply",
+		method: "post",		
+		data,
+	});
+}
+
+// 寄回商品反馈
+export function returnGoodsFeedback(data) {
+	return request({
+		url: "/order/sendGoodsBack",	
+		method: "post",		
+		data,
+	});
+}

pages/mine/mine.vue

@@ -70,34 +70,47 @@
 				</view>
 			</view>
 			<!-- 入驻 -->
-			<view class="mine_top_comm_warp enter_list">
+			<view class="mine_content_comm_warp mine_top_comm_warp mine_tool_warp">
-				<view class="enter_item" @click="jumpEnter('merchant')">
+				<view class="mine_tool_title">入驻信任桥</view>
-					<view>
+				<view class="settled_list">
-						<view class="enter_title">商家入驻</view>
+					<view class="enter_item" @click="jumpEnter('merchant')">
+						<view class="enter_item_cell">
+							<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/enter_sj.png" width="36" height="36"
+								bgColor="#f1f6ff00"></up-image>
+							<view class="enter_item_text">
+								<view class="enter_title">商家入驻</view>
+								<view class="enter_remark">获取更多客户与订单机会</view>
+							</view>
+						</view>
 						<view class="enter_apply">
 							<text class="enter_apply_title">申请</text>
 							<view style="margin-top: 10rpx;">
-								<up-image src="/static/common/right_y.png" width="14" height="14" bgColor="#f1f6ff00"></up-image>
+								<up-image src="/static/common/right.png" width="14" height="14" bgColor="#f1f6ff00"></up-image>
 							</view>
+
 						</view>
 					</view>
-					<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/enter_sj.png" width="50" height="50"
+
-						bgColor="#f1f6ff00"></up-image>
+					<view class="enter_item" @click="jumpEnter('brand')">
-				</view>
+						<view class="enter_item_cell">
-				<view class="enter_item" @click="jumpEnter('brand')">
+							<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/enter_pp.png" width="36" height="36"
-					<view>
+								bgColor="#f1f6ff00"></up-image>
-						<view class="enter_title">企业/品牌入驻</view>
+							<view class="enter_item_text">
+								<view class="enter_title">企业/品牌入驻</view>
+								<view class="enter_remark">助您打造专属品牌馆</view>
+							</view>
+						</view>
+
 						<view class="enter_apply">
 							<text class="enter_apply_title">申请</text>
 							<view style="margin-top: 10rpx;">
-								<up-image src="/static/common/right_y.png" width="14" height="14" bgColor="#f1f6ff00"></up-image>
+								<up-image src="/static/common/right.png" width="14" height="14" bgColor="#f1f6ff00"></up-image>
 							</view>
 						</view>
 					</view>
-					<up-image src="https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/enter_pp.png" width="50" height="50"
-						bgColor="#f1f6ff00"></up-image>
 				</view>
 			</view>
+
 			<!-- 服务工具 -->
 			<view class="mine_content_comm_warp mine_top_comm_warp mine_tool_warp">
 				<view class="mine_tool_title">服务工具</view>
@@ -396,14 +409,14 @@ export default {
 		jumpEnter(type) {
 			// 商家入驻
 			if (type === "merchant") {
-				uni.navigateTo({
+				// uni.navigateTo({
-					url: '/pages/merchant_settlement/merchant_settlement',
+				// 	url: '/pages/rwa_package/merchant_settlement/merchant_settlement.vue',
-				})
+				// })
-				// this.openShow = true;
+				this.openShow = true;
 			} else if (type === "brand") {
 				// 企业/品牌入驻
 				// uni.navigateTo({
-				// 	url:'/pages/brand_settlement/brand_settlement',
+				// 	url: '/pages/brand_settlement/brand_settlement',
 				// })
 				this.brandShow = true;
 			}
@@ -566,6 +579,37 @@ export default {
 
 .mine_top_comm_warp {
 	margin-top: 30rpx;
+
+	.settled_list {
+		width: 100%;
+		box-sizing: border-box;
+
+		.enter_item {
+			width: 100%;
+			margin-top: 10rpx;
+			padding: 12rpx 0;
+			box-sizing: border-box;
+
+			.enter_item_cell {
+				display: flex;
+
+				.u-transition {
+					margin-top: 5rpx;
+				}
+
+				.enter_item_text {
+					margin-left: 10rpx;
+
+					.enter_remark {
+						font-size: 24rpx;
+						color: #999999;
+						margin-top: 10rpx;
+					}
+				}
+
+			}
+		}
+	}
 }
 
 /* 内容公共 end */

pages/mine_package/mine_order/after-sales/index.vue

@@ -1,15 +1,86 @@
 <template>
-  <view>
+	<view class="content_">
-    售后
+		<view class="content_1 ">选择退货原因</view>
-  </view>
+		<view class="content-radio">
+			<up-radio-group v-model="radiovalue1" iconColor="#fff" activeColor="#7934F6" placement="column" iconPlacement="right" @change="groupChange">
+				<up-radio :customStyle="{marginBottom: '8px'}" v-for="(item, index) in radioList" :key="index"
+					:label="item.name" :name="item.name" @change="radioChange">
+				</up-radio>
+			</up-radio-group>
+		</view>
+		<view class="button operate_but_2" @click="goNext(2)">下一步</view>
+	</view>
+
 </template>
 
 <script>
-export default {
+	export default {
-  data() {
+		data() {
-    return {
+			return {
-      activeIndex: 0,
+				activeIndex: 0,
-    }
+				radiovalue1:'外观/型号/参数与描述不符',
-  },
+				radioList: [{
-}
+						name: '外观/型号/参数与描述不符',
+						disabled: false,
+					},
+					{
+						name: '协商一致退款',
+						disabled: false,
+					},
+					{
+						name: '质量问题',
+						disabled: false,
+					},
+					{
+						name: '少件（缺少配件）',
+						disabled: false,
+					},
+				]
+			}
+		},
+		methods:{
+			groupChange(){
+				
+			},
+			radioChange(){
+				
+			},
+			goNext(val){
+				console.log('val',val);
+				this.$emit('nextNum',val)
+			}
+		}
+	}
 </script>
+<style lang="scss" scoped>
+	.content_ {
+		margin-top: 20rpx;
+
+		.content_1 {
+			text-align: left;
+			margin-top: 20rpx;
+		}
+		.button{
+			height: 88rpx;
+			background: $app-bt-bj;
+			color: #ffffff;
+			line-height: 88rpx;
+			border-radius: 8rpx;
+			margin-bottom: 24rpx;
+		}
+		.content-radio {
+			display: flex;
+			justify-content: space-between;
+			justify-items: center;
+			padding: 34rpx 0;
+
+			.content-name {
+				font-size: 28rpx;
+			}
+
+			&:nth-of-type(1) {
+				margin-top: 32rpx;
+			}
+		}
+	}
+</style>

pages/mine_package/mine_order/after-sales/refund-popu.vue

@@ -0,0 +1,411 @@
+<template>
+  <!-- 退货退款模块 -->
+  <view>
+    <view v-if="status > 0">
+      <salesStatus
+        :topLabel="topLabel"
+        :topTitle="topTitle"
+        :status="status"
+      ></salesStatus>
+    </view>
+    <view class="refund_content">
+      <view class="content_card">
+        <image :src="product.items[0].mainGraph" class="card_img"></image>
+        <view class="card_info">
+          <view class="card_box">
+            <view class="card_title">
+              <view class="title">{{ product.items[0].title }}</view>
+              <view class="price">¥{{ product.items[0].goodsAmount }}</view>
+            </view>
+            <view class="shop_status">规格：{{ product.sumAmount }}</view>
+          </view>
+          <view class="card_total">
+            <text>共{{ product.buyNum }}件</text>
+            <text>合计{{ product.sumAmount }}元</text>
+          </view>
+        </view>
+      </view>
+      <view class="card_list">
+        <view class="list_left">退款原因</view>
+        <view> {{ RETURN_REASON_OBJ[product.afterReason] }} </view>
+      </view>
+      <view class="card_list">
+        <view class="list_left">退款金额</view>
+        <view>
+          ¥{{ product.refundAmount || product.sumAmount }}
+          <text style="font-size: 24rpx; color: #999">（退回现金余额)</text>
+        </view>
+      </view>
+
+      <view v-if="status > 1" class="card_list_box">
+        <view class="card_list">
+          <view class="list_left">邮寄地址</view>
+          <view>{{ address || "--" }}</view>
+        </view>
+        <view class="card_list">
+          <view class="list_left">填快递单号</view>
+          <input
+            class="input-express"
+            type="text"
+            :disabled="status != 2"
+            placeholder="请填写快递单号"
+            v-model="cancelForm.expressNo"
+          />
+        </view>
+        <view class="card_list">
+          <view class="list_left">填快递名称</view>
+          <input
+            class="input-express"
+            type="text"
+            :disabled="status != 2"
+            placeholder="请填写快递名称"
+            v-model="cancelForm.expressName"
+          />
+        </view>
+      </view>
+      <view
+        v-if="buttonLabel"
+        :class="[
+          'bottom_box',
+          {
+            bottom_box_disabled:
+              status == 2 && (!cancelForm.expressNo || !cancelForm.expressName),
+          },
+          { bottom_box_quash: status == 1 },
+        ]"
+      >
+        <view class="button operate_but_2" @click="submit"
+          > {{ buttonLabel }}</view
+        >
+      </view>
+    </view>
+  </view>
+  <up-toast ref="uToastRef"></up-toast>
+</template>
+<script>
+import salesStatus from "../components/salesStatus.vue";
+import {
+  afterSaleApply,
+  cancelAfterSale,
+  returnGoodsFeedback,
+} from "@/api/order.js";
+import { RETURN_REASON } from "@/pages/mine_package/mine_order/emun/index.js";
+export default {
+  components: { salesStatus },
+  props: {
+    product: {
+      type: Object,
+      default: {},
+    },
+    cancelForm: {
+      type: Object,
+      default: {},
+    },
+  },
+
+  data() {
+    return {};
+  },
+  methods: {
+    submit() {
+      // 未售后 -- 提交申请
+      if (this.status == 0) {
+        this.onAfterSaleApply();
+      }
+      //已售后-- 撤销申请
+      if (this.status == 1) {
+        this.onCancelApply();
+      }
+      if (this.status == 2) {
+        if (!this.cancelForm.expressNo || !this.cancelForm.expressName) {
+          this.$refs.uToastRef.show({
+            type: "error",
+            message: "请填写快递信息",
+          });
+          return;
+        }
+        this.onReturnGoods();
+      }
+      // 售后中--退款失败
+      if (this.status == 4) {
+        // 重新发起
+        this.onClose(true);
+      }
+      // 售后中--退款成功
+      if (this.status == 5) {
+        this.onClose();
+      }
+    },
+    // 未售后 -- 售后
+    async onAfterSaleApply() {
+      const params = {
+        reason: this.cancelForm.afterReason,
+        type: this.product.afterType, //0-未售后 1-退款不退货， 2-退货退款 3-换货
+        id: this.product.id, // 订单id
+        itemIds: this.product.items[0]?.id, // 商品id
+      };
+      console.log("确认取消", params);
+      if (!params.reason) {
+        this.$refs.uToastRef.show({
+          type: "error",
+          message: "请选择取消原因",
+        });
+        return;
+      }
+      const { bizcode } = await afterSaleApply(params);
+      if (bizcode === 100) {
+        this.$refs.uToastRef.show({
+          type: "error",
+          message: "申请成功，等商家审核",
+        });
+        this.onClose();
+      }
+    },
+    // 撤销申请
+    async onCancelApply() {
+      const params = {
+        afterId: this.product.afterId,
+      };
+      console.log("撤销申请", params);
+      const { bizcode } = await cancelAfterSale(params);
+      if (bizcode === 100) {
+        this.$refs.uToastRef.show({
+          type: "error",
+          message: "撤销成功",
+        });
+        this.onClose();
+      }
+    },
+    // 寄回商品
+    async onReturnGoods() {
+      const params = {
+        afterId: this.product.afterId,
+        expressNo: this.cancelForm.expressNo,
+        expressName: this.cancelForm.expressName,
+      };
+      console.log("寄回商品", params);
+      const { bizcode } = await returnGoodsFeedback(params);
+      if (bizcode === 100) {
+        this.$refs.uToastRef.show({
+          type: "error",
+          message: "寄回成功",
+        });
+        this.onClose();
+      }
+    },
+    // 关闭弹窗
+    onClose(item = false) {
+      this.$emit("close", item);
+    },
+  },
+  computed: {
+    status() {
+      // 未售后 -- 提交申请
+      if (this.product.afterType == 0) {
+        return 0;
+      }
+      //  已售后
+      if (this.product.afterType > 0) {
+        if (this.product.status == 0) {
+          return 1;
+        }
+        // 售后中--待买家寄回商品
+        if (this.product.status == 1) {
+          return 2;
+        }
+        // 售后中--快递已发，待卖家收货
+        if (this.product.status == 2) {
+          return 3;
+        }
+        // 售后中--卖家已收货，退款失败
+        if (this.product.status == 6) {
+          return 4;
+        }
+        // 售后中--卖家已收货，退款成功
+        if (this.product.status == 7) {
+          return 5;
+        }
+      }
+    },
+    /* 根据订单状态按钮显示不同文案 */
+    buttonLabel() {
+      if (this.status == 0) {
+        return "提交申请";
+      } else if (this.status == 1) {
+        return "撤销申请";
+      } else if (this.status == 2) {
+        return "确定退货/退款";
+      } else if (this.status == 3) {
+        return "确定退货/退款";
+      } else if (this.status == 4) {
+        return "重新发起";
+      } else if (this.status == 5) {
+        return "我知道了";
+      }
+    },
+    /* 根据订单状态显示不label */
+    topLabel() {
+      if (this.status == 1) {
+        return "您已成功发起退货/退款申请，请耐心等待审";
+      } else if (this.status == 2) {
+        return "请按照以下地址寄回商品";
+      } else if (this.status == 3) {
+        return "请按照以下地址寄回商品";
+      } else if (this.status == 4) {
+        return "您发起的退货/退款申请，未通过";
+      } else if (this.status == 5) {
+        return "您发起的退货/退款申请，已处理完成";
+      }
+    },
+    /* 根据订单状态显示不title */
+    topTitle() {
+      if (this.status == 1) {
+        return "退款/退货审核中";
+      } else if (this.status == 2) {
+        return "退款申请通过";
+      } else if (this.status == 3) {
+        return "退款申请通过";
+      } else if (this.status == 4) {
+        return "退款申请失败";
+      } else if (this.status == 5) {
+        return "退款成功";
+      }
+    },
+
+    /* 计算地址 */
+    address() {
+      return `${this.product.provinceName || ""}${this.product.cityName || ""}${
+        this.product.areaName || ""
+      }${this.product.address || ""}  ${this.product.name || ""} ${
+        this.product.phone || ""
+      }`;
+    },
+    RETURN_REASON_OBJ() {
+      return RETURN_REASON;
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.refund_content {
+  width: 100%;
+  padding: 0 32rpx;
+  box-sizing: border-box;
+  overflow-y: scroll;
+  .card_list_box {
+    padding-bottom: 88rpx;
+  }
+  .content_card {
+    display: flex;
+    margin-bottom: 48rpx;
+    .card_img {
+      width: 156rpx;
+      height: 156rpx;
+      margin-right: 20rpx;
+    }
+
+    .card_info {
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      width: calc(100% - 176rpx);
+
+      .card_box {
+        .card_title {
+          font-weight: bold;
+          font-size: 30rpx;
+          width: 100%;
+          color: #000000;
+
+          box-sizing: border-box;
+          display: flex;
+          flex-wrap: nowrap;
+          justify-content: space-between;
+          text-align: left;
+          font-style: normal;
+
+          .title {
+            width: 80%;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+
+          .price {
+            width: 20%;
+            text-align: right;
+          }
+        }
+
+        .shop_status {
+          color: #999;
+          font-size: 28rpx;
+          margin-top: 15rpx;
+        }
+      }
+
+      .card_total {
+        color: #999;
+        font-size: 28rpx;
+        text-align: right;
+      }
+    }
+  }
+
+  .card_list {
+    display: flex;
+    justify-content: space-between;
+    height: 96rpx;
+    line-height: 96rpx;
+    font-size: 28rpx;
+    border-bottom: 1px solid #eaeaea;
+
+    .list_left {
+      color: #666;
+    }
+    .input-express {
+      display: flex;
+      align-items: center;
+      width: 400rpx;
+      height: 100%;
+      text-align: end;
+      font-size: 28rpx;
+    }
+  }
+  .bottom_box {
+    position: fixed;
+    bottom: 0;
+    left: 0; /* 补充 left:0，确保容器从左侧开始 */
+    right: 0; /* 补充 right:0，让容器宽度自适应屏幕/弹窗 */
+    text-align: center;
+    background: #ffffff;
+    padding: 0 48rpx 28rpx; /* 增加内边距，避免按钮贴边 */
+    z-index: 10; /* 确保整个底部区域在内容上方 */
+    .button {
+      width: 100%; /* 直接用 100%，利用父容器的 padding 控制边距 */
+      height: 88rpx;
+      background: linear-gradient(270deg, #b164fb 0%, #7934f6 100%);
+      color: #ffffff;
+      line-height: 88rpx;
+      text-align: center;
+      border-radius: 8rpx;
+      margin-top: 28rpx; /* 只保留顶部 margin，底部由父容器 padding 控制 */
+      /* 移除 margin 左右值，改用父容器 padding 控制边距 */
+    }
+    &.bottom_box_quash {
+      .button {
+        background: #ffffff;
+        color: #b164fb;
+        border: 1rpx solid #b164fb;
+      }
+    }
+    &.bottom_box_disabled {
+      .button {
+        background: #e8ebf6;
+        color: #cbced9;
+        border: 1rpx solid #e7ebf6;
+      }
+    }
+  }
+}
+</style>

pages/mine_package/mine_order/components/salesStatus.vue

@@ -0,0 +1,56 @@
+<template>
+    <!-- 退货退款进度icon -->
+    <view class="status_box">
+        <image class="status_img" :src="`https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/mine-purse/icon_arrow_black_${status == 4 ? 2 : status == 5 ? 3 : 1}.png`"></image>
+        <view class="status_name">{{ topTitle }}</view>
+        <view class="status_tip">{{ topLabel }}</view>
+        <view class="line"></view>
+    </view>
+</template>
+
+<script>
+export default {
+    name: 'salesStatus',
+    props: {
+        topLabel: {
+            type: String,
+            default: ''
+        },
+        topTitle: {
+            type: String,
+            default: ''
+        },
+        status: {
+            type: Number,
+            default: 0
+        }
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.status_box {
+
+    text-align: center;
+    .status_img {
+        width: 108rpx;
+        height: 108rpx;
+    }
+    .status_name {
+        margin-top: 20rpx;
+        font-size: 32rpx;
+        font-weight: 600;
+    }
+    .status_tip {
+        font-size: 28rpx;
+        color: #999;
+        margin: 20rpx 0;
+    }
+    .line {
+        width: 100%;
+        height: 16rpx;
+        background-color: #f5f5f7;
+        margin-bottom: 48rpx;
+    }
+}
+</style>

pages/mine_package/mine_order/emun/index.js

@@ -0,0 +1,33 @@
+export const RETURN_REASON = {
+    1: "我不想买了",
+    2: "下错单了",
+    3: "商家未发货",
+    4: "商品质量问题",
+    5: "商品实物与描述不符",
+    6: "商家发错货",
+    7: "假冒品牌",
+    8: "配件破损",
+    9: "主商品破损",
+    10: "协商一致退款",
+    11: "少件(少配件)",
+    12: "其他",
+}
+
+export const RETURN_REASON_LIST = [
+    { id: 1, name: '我不想买了' },
+    { id: 2, name: '下错单了' },
+    { id: 3, name: '商家未发货' },
+    { id: 4, name: '商品质量问题' },
+    { id: 5, name: '商品实物与描述不符' },
+    { id: 6, name: '商家发错货' },
+    { id: 7, name: '假冒品牌' },
+    { id: 8, name: '配件破损' },
+    { id: 9, name: '主商品破损' },
+    { id: 10, name: '协商一致退款' },
+    { id: 11, name: '少件(少配件)' },
+    { id: 12, name: '其他' },
+]
+    
+   
+
+ 

pages/rwa_package/dongjian/check.vue

@@ -6,13 +6,12 @@
 			<view class="top-info flex-r-lr">
 				<image src="@/static/new/he.png"></image>
 				<view class="right-view">
-					<text class="text-36 text-zu">消费型合伙人协议</text>
+					<text class="text-36 text-zu">{{ obj.contractName }}</text>
 					<view class="bottom-panel">
-						<view class="flex-r-lr mt-24" v-for="(item,index) in dataList" :key="dataList.value">
+						<view class="flex-r-lr mt-24" v-for="(item, index) in dataList" :key="dataList.value">
-							<text class="text-fu text-24">{{item.text}}</text>
+							<text class="text-fu text-24">{{ item.text }}</text>
 							<view class="list-right">
-								<text class="text-24" 
+								<text class="text-24" :class="{ 'text-lu': index == 0, 'text-zu': index != 0 }">{{ item.value }}</text>
-								:class="{'text-lu':index == 0,'text-zu':index != 0}">{{item.value}}</text>
 							</view>
 						</view>
 					</view>
@@ -20,9 +19,9 @@
 			</view>
 			<text class="text-zu text-32 mt-32" style="margin-left:38rpx">合同签约人信息</text>
 			<view class="bottom">
-				<view class="bottom-lsit" v-for="(item,index) in bottomList" :key="item.value"> 
+				<view class="bottom-lsit" v-for="(item, index) in bottomList" :key="item.value">
-					<text class="text-24 text-fu" style="min-width:184rpx;display: inline-block;">{{item.text}}</text>
+					<text class="text-24 text-fu" style="min-width:184rpx;display: inline-block;">{{ item.text }}</text>
-					<text class="text-24 text-zu">{{item.value}}</text>
+					<text class="text-24 text-zu">{{ item.value }}</text>
 				</view>
 			</view>
 			<view class="bottom-btn">
@@ -41,45 +40,45 @@ import { getUserInfo } from '@/api/auth.js';
 import Header from '@/components/common/header.vue';
 import TopSafe from '@/components/common/top-safe.nvue'
 import ContractItem from './components/contract-item.vue'
-import { getContractList,fileUrls } from '@/api/contract.js'
+import { getContractList, fileUrls } from '@/api/contract.js'
 import func from '@/utils/func.js';
 
 export default {
-	components: { Header,TopSafe,ContractItem },
+	components: { Header, TopSafe, ContractItem },
 	data() {
 		return {
-			dataList:[
+			dataList: [
-				{text:'合同状态',value:'签约完成'},
+				{ text: '合同状态', value: '签约完成' },
-				{text:'合同编号',value:'69485222011627525'},
+				{ text: '合同编号', value: '' },
-				{text:'发起方',value:'信任桥（深圳）网络科技有限公司'},
+				{ text: '发起方', value: '信任桥（深圳）网络科技有限公司' },
-				{text:'发起时间',value:'2025-08-11 12:00:00'},
+				{ text: '发起时间', value: '' },
-				{text:'完成结束时间',value:'2025-08-11 12:00:00'},
+				{ text: '完成结束时间', value: '' },
 			],
-			bottomList:[
+			bottomList: [
-				{text:'签约人',value:'信任桥会员 章三'},
+				{ text: '签约人', value: '信任桥会员 章三' },
-				{text:'状态',value:'已签署'},
+				{ text: '状态', value: '已签署' },
-				{text:'时间',value:'2025-08-11 12:00:00'},
+				{ text: '时间', value: '2025-08-11 12:00:00' },
 			],
-			obj:null,
+			obj: null,
-			url:''
+			url: ''
 		};
 	},
 	onLoad(option) {
-			this.init();
+		this.init();
 	},
 	methods: {
-		init(){
+		init() {
 			this.isSignContract()
 		},
-		getfileUrls(){
+		getfileUrls() {
 			let params = {
-					businessType:'FLOW',
+				businessType: 'FLOW',
-					businessIds:[this.obj.flowId]
+				businessIds: [this.obj.flowId]
 			}
-			fileUrls(params).then(res=>{
+			fileUrls(params).then(res => {
-				if(res.bizcode == 100){
+				if (res.bizcode == 100) {
 					this.url = res.data.fileUrls[0].url;
-				}else{
+				} else {
 					this.$refs.uToastRef.show({
 						type: 'error',
 						message: res.msg,
@@ -87,21 +86,24 @@ export default {
 				}
 			})
 		},
-		isSignContract(){
+		isSignContract() {
 
-			getContractList().then(res=>{
+			getContractList().then(res => {
-				if(res.bizcode == 100){
+				if (res.bizcode == 100) {
 					this.obj = JSON.parse(JSON.stringify(res.data[0]));
-					this.obj.time = func.formatDate(new Date(res.data[0].signatureTime),2);
+					this.obj.time = func.formatDate(new Date(res.data[0].signatureTime), 2);
-					this.obj.details.startTime = func.formatDate(new Date(res.data[0].details.startTime),2);
+					this.obj.details.startTime = func.formatDate(new Date(res.data[0].details.startTime), 2);
-					this.obj.details.endTime = func.formatDate(new Date(res.data[0].details.endTime),2);
+					this.obj.details.endTime = func.formatDate(new Date(res.data[0].details.endTime), 2);
-					this.dataList[2].value = this.obj.flowId;
+					// this.dataList[2].value = this.obj.flowId;
+
+					this.dataList[0].value = this.obj.state ? '已签署' : '未签署';
+					this.dataList[1].value = this.obj.flowId;
 					this.dataList[3].value = this.obj.details.startTime;
 					this.dataList[4].value = this.obj.details.endTime;
 					this.bottomList[0].value = this.obj.signatureName;
 					this.bottomList[2].value = this.obj.time;
 					this.getfileUrls();
-				}else{
+				} else {
 					this.$refs.uToastRef.show({
 						type: 'error',
 						message: res.msg,
@@ -109,82 +111,113 @@ export default {
 				}
 			})
 		},
-		onOpen(){
+		onOpen() {
-			// window.open(this.obj.contractName,'_blank')
+			// #ifdef APP-PLUS
-			window.open(this.url,'_blank')
+			uni.downloadFile({
-		}
+				url: this.url,
+				success: (res) => {
+					if (res.statusCode === 200) {
+						uni.saveFile({
+							tempFilePath: res.tempFilePath,
+							success: (res) => {
+								uni.openDocument({
+									filePath: res.savedFilePath,
+									success: (res) => {
+										console.log('打开文档成功')
+									}
+								})
+							}
+						})
+					}
+				}
+			})
+			// #endif
+			// #ifdef H5
+			window.open(this.url, '_blank')
+			// #endif
+		},
+
 	}
 }
 </script>
 
 <style lang="scss" scoped>
-.contract-view{
+.contract-view {
-	width:100%;
+	width: 100%;
-	height:calc(100% - 88rpx - var(--status-bar-height));
+	height: calc(100% - 88rpx - var(--status-bar-height));
 	display: flex;
 	flex-direction: column;
 	overflow-y: auto;
 	// padding: 0 32rpx;
 	box-sizing: border-box;
 	position: relative;
-	.bottom-btn{
+
-		width:100%;
+	.bottom-btn {
+		width: 100%;
 		display: flex;
 		position: absolute;
-		bottom:80rpx;
+		bottom: 80rpx;
 		flex-direction: row;
 		justify-content: center;
-		.left-btn{
+
-			width:48%;
+		.left-btn {
+			width: 48%;
 			background: #E4D6FD;
 			border-radius: 8rpx;
 		}
-		.right-btn{
+
-			width:calc(100% - 60rpx);
+		.right-btn {
-			height:88rpx;
+			width: calc(100% - 60rpx);
-			background: linear-gradient( 270deg, #B164FB 0%, #7934F6 100%);
+			height: 88rpx;
+			background: linear-gradient(270deg, #B164FB 0%, #7934F6 100%);
 			border-radius: 8rpx;
 		}
 	}
-	.bottom{
+
+	.bottom {
 		display: flex;
 		padding: 40rpx 46rpx;
 		box-sizing: border-box;
 		flex-direction: column;
 		justify-content: space-between;
-		margin-top:24rpx;
+		margin-top: 24rpx;
 		background-color: #fff;
-		width:100%;
+		width: 100%;
-		min-height:216rpx;
+		min-height: 216rpx;
 	}
-	.top-info{
+
-		width:100%;
+	.top-info {
-		min-height:440rpx;
+		width: 100%;
+		min-height: 440rpx;
 		padding: 68rpx 32rpx 64rpx;
 		box-sizing: border-box;
 		background-color: #fff;
-		.right-view{
+
-			height:100%;
+		.right-view {
-			flex:1;
+			height: 100%;
+			flex: 1;
 			flex-direction: column;
 			display: flex;
-			margin-left:46rpx;
+			margin-left: 46rpx;
-			.bottom-panel{
+
-				width:100%;
+			.bottom-panel {
-				flex:1;
+				width: 100%;
+				flex: 1;
 				display: flex;
 				flex-direction: column;
-				.list-right{
+
-					width:238rpx;
+				.list-right {
-					margin-left:40rpx;
+					width: 255rpx;
-					word-break:break-all;
+					margin-left: 25rpx;
+					word-break: break-all;
 					display: flex;
 				}
 			}
 		}
-		image{
+
-			width:200rpx;
+		image {
-			height:260rpx;
+			width: 200rpx;
+			height: 260rpx;
 		}
 
 	}

pages/rwa_package/rwa/rwa.vue

@@ -20,7 +20,7 @@
 					<view style="margin-top: 10rpx;">
 						<up-image src="/static/rwa/tx.png" width="18" height="18" bgColor="#f1f6ff00" />
 					</view>
-					<view class="but-item-msg">提现</view>
+					<view class="but-item-msg">行权兑换</view>
 				</view>
 				<view class="but-item jl-warp" @click="jumpWithdrawalLog">
 					<view style="margin-top: 10rpx;">

utils/request.js

@@ -87,7 +87,7 @@ function request(options) {
 					}
 				} else {
 					uni.showToast({
-						title: data.msg,
+						title: data.msg || "系统错误，请稍后再试",
 						icon: 'none', // 可选 success/loading/none
 						duration: 2000, // 持续时长，单位ms
 					});