From 22d1ca72cb0e0ea98e06e03a3251d8606f068821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E5=BD=A6=E7=A5=96?= <605893810@qq.com>
Date: Fri, 26 Sep 2025 15:04:04 +0800
Subject: [PATCH 01/12] =?UTF-8?q?feat=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=8C=BA?=
 =?UTF-8?q?=E5=8E=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                 |   5 ++---
 .../mine_address/mine_address.vue             |   2 +-
 .../mine_address_add/mine_address_add.vue     |   1 +
 .../order_submit/order_submit.vue             |   3 ++-
 static/column/supply_chain_sel.png            | Bin 1282 -> 1082 bytes
 utils/index.js                                |   6 ++++++
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/manifest.json b/manifest.json
index 0d64746..b9107a1 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "appid" : "__UNI__4910728",
     "description" : "信任桥优品是一款集线上商城、线下联盟商家的DAO聚合商城；通过“有趣”“有利”“有希望”的卖货玩法，吸引消费者、推广者、商家、投资人参与生态，共同打造共创共享的全球产业生态。",
     "versionName" : "1.0.1",
-    "versionCode" : 131,
+    "versionCode" : 132,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -82,8 +82,7 @@
                     "weixin" : {
                         "appid" : "wx7a5902cd556d9396",
                         "UniversalLinks" : "https://app.tbmall.xin/uni-universallinks/__UNI__4910728/"
-                    },
-                    "apple" : {}
+                    }
                 }
             },
             "icons" : {
diff --git a/pages/mine_package/mine_address/mine_address.vue b/pages/mine_package/mine_address/mine_address.vue
index 49ffce2..e7edb49 100644
--- a/pages/mine_package/mine_address/mine_address.vue
+++ b/pages/mine_package/mine_address/mine_address.vue
@@ -8,7 +8,7 @@
 				<view style="margin-left: 20rpx;">{{ item.phone }}</view>
 			</view>
 			<view class="address_item_address">
-				{{ item.countryName }} {{ item.provinceName }} {{ item.cityName }} {{ item.areaName }} {{ item.address }}{{ item.townshipName }}
+				{{ item.countryName }} {{ item.provinceName }} {{ item.cityName }} {{ item.areaName }} {{ item.townshipName }} {{ item.address }}
 			</view>
 			<view class="address_operate">
 				<up-checkbox :customStyle="{}" label="已默认" name="agree" usedAlone :checked="item.isDefault" shape="circle"
diff --git a/pages/mine_package/mine_address_add/mine_address_add.vue b/pages/mine_package/mine_address_add/mine_address_add.vue
index 17bb43a..9bc0f08 100644
--- a/pages/mine_package/mine_address_add/mine_address_add.vue
+++ b/pages/mine_package/mine_address_add/mine_address_add.vue
@@ -203,6 +203,7 @@ export default {
 				this.form.countryId = regionId[0] ? regionId[0] : null;
 				this.form.provinceId = regionId[1] ? regionId[1] : null;
 				this.form.cityId = regionId[2] ? regionId[2] : null;
+				this.form.areaId = regionId[3] ? regionId[3] : null;
 				this.form.townshipId = regionId[4] ? regionId[4] : null;
 			}
 			this.regionShowCheck(false);
diff --git a/pages/order_package/order_submit/order_submit.vue b/pages/order_package/order_submit/order_submit.vue
index fa7e080..6094d7d 100644
--- a/pages/order_package/order_submit/order_submit.vue
+++ b/pages/order_package/order_submit/order_submit.vue
@@ -446,7 +446,8 @@ export default {
 										adress: null,
 										addressId: null,
 										areaName: null,
-										cityName: null,
+										cityName: null,
+										townshipName:null,
 										goodsId: this.sed.id,
 										id: this.sed.specsId.id,
 										img: data.goodsGraph,
diff --git a/static/column/supply_chain_sel.png b/static/column/supply_chain_sel.png
index c75c75b1078b2285a376a977df0c318a8360ae6f..239feedf4e3eae8150c9e32044dacdf85345c0ff 100644
GIT binary patch
delta 1062
zcmV+>1ljw73c3i8BYy+$Nkl<ZcmeE~Plyv&9LK-Em*}n=(%yP0xC_mm+Dd6sdMUKM
z6bh|Kv9z@GTrc85#R*=#Na9}vFM1Rf#XpF+f*^ukJei32=d=-2^x{p{jT=qo`TM<@
zc{9l}$*h~Kv*2TX^ZUKu@AuyClQ(%YlPIjQ_7Qm07i{gXuz&N->#1^S;Y7LAeBzXv
zZPt1<#jp9K%nZWPd&Rm|*eNdlf~>v=(Ek875|ClNst3W;+z4S{7Q=+FSzw1(7UW(a
zARmT5tYui3$*}n-7MQZGV-oy8T9hyeTfk$10s0lGZ6TWl*1+d!<&CmgU|#x6T7jc%
z7C5c2y<95;)_-vMa?KdgVAVUl*VkU`Eced%Hk<EvtO!^WPFHIa|A`R6i9?WBr8e<5
z%Rg+Ni_1&mUlA~Y?5Z-%L1;R)q$vALEDX4zxqNFyz|i_%euQog%D#H}OrDUpf<Eh8
zzK>17<ZAq7I`4T3fi<<3JqLlutC>B;*4N;6yfNK+`+uhM2Q(gwh%G*F^K#S-NXB4!
zEyBhH{jua8K_uXN6DXZm=v>~lY5p@wK723#!bN7Yh}hzj80X9aIxqcYi7*M9Kga@C
zYPr3Q`gqQz%vXG=ulVs~iZHcqedgl!!rYh)I8YzEFCw=1B*rT{DgDHv^%Y?eCSeQ4
zslX6@9)Hw1aC_`wrJnm88iS!V8rpq3U8zkF%MZcjm$?EFpTt<GtyO{NZ3MAc&9K5C
zEW#Ac>jI7jT$PEvO-1r9RquQ{7{DKJs6PIP%}XqO4_9SlYsUg_SXe*TcUCXBWp{D$
z3(p*UcD{XC;H)hyeUE;%V}W1i-c0wMRf2><mVewvxzvpQD!Cyc5vMf&Q#3|u-5h_H
z1zN(f(yw+buyWhg*cnG0=vTW7_)qA}p6^;;mW$0<5dAigt9#SQ#uNED7+0<3Z^~v1
zB=M%>+U4THtgr}EFrR1(%uk{Hh2r9Z(wzq&42G4_z(_WonVO-6MVN%m`1oXjq18@)
zHGeSoQT8W2MzZO;ijy8QY`!xDmVoa}tVXoymeh~1g}_U)(&-pJu*TFr+{ntuC8)&r
zXe4aI2j=&RR_XiePO*6mP)8GTBu*PXuvhv=BJAL|vroM4@Xn(G9v)%OOcq!Jot{`~
zx=}U@Ou+Nh5cYtO4%sX)f8Vb5<fW%e+JCZHVBJ<#Ui$g;P<kZ7By3&}u)x*38~BH#
z+A0Y_@I!0EqSaQz=EGQE=~wIH*U+X-{Pj4={ii%&)i<JF^QmEA7Q@6a!O;aQPWd#I
zT5emVHZjTn=ww;TE90t(Uvsj;48kHzQCR{U4W`ll2t4YmvgTI!9RL6T|Np1um>&%Q
g000I_L_t&o0Gzf0cYJU$%>V!Z07*qoM6N<$g1lZGqyPW_

delta 1263
zcmV<L1Q7eW2!aZbBYy<9Nkl<ZcmeE}TWefZ6vt;K#yp6Spy-2OgxaT;d;q~4UO=c)
z#WX@d0-0n+R0IVn_$=nd7nL}ZOhO*SOCws^fS`g}?H4HRQ!N_72SrH0_94w&`up$M
zd$Z<rPMMOqG|;fu*=w)0&iViLIcM)P$z}H0-)-PtKd}9Ohks{gW*(ZGn=8%F&u`LK
z=^OntuPN=4Sdvey<qiY(?C|jLxokFDpzuNZA^N^HuPN<<Sj1!jBCuxDXf(d&gu89Q
zAbqijNo;{50yCTADo}!=P3)Pit*w!zrKM~?O`6iiHpL<)vB{T3U=q(M;4Qzry!_+(
z`ubHr?pr6#Wq-60%ww)uwg}9O9&lL>+uPe`=my#>gJp}r%pxu@&2pf$h+78B7J;eR
z7j3V=S@z9o8MDn|sg0Ur*ej_89VYe!TqqQ#d0d~#fcYRzliUI|UtwS1A4{w2B)%tL
zD*(*9`F#FW8<Ve?a`L_HNwe+Ad|kerot=Hm3#4}Ca)0@AR`4lbkj>?COWeUn{5T_D
zF~;t7Q7v263C1^U(iTIzA`84@3Z{mJhJHct)5*!nxO<p<aO-U9(}0}wff4TJHwcc)
z@V_NKf@M^rTKqcJwn<Bx(xzYv3oWu);19{h1bzm=;@H^O$MVx`adGi-y<UHT{J)sm
z{oK`4GJgj5VQT-VMztEGnY5&t$cssAE*ydR{JzI$@h<MfVQj-?n};Ir;iFBr{c&Yw
zMW6B)$?D>o=mf$OjMa9y-b<>{AkBCpdIgIi&p8{|VKIp<#3Qf*Y}Pg2u?yJq6bERu
zvu`M$G~TlVJi?3g4T{c^caNXmHoYciRpV<9*ned3c_Odlhj)EL4A=!R5s$3}I7XY!
z@n)CN9ZS2zM*)2})8U`5J=(6EoYjch$=Xz4zU3E9@jb@3?n$1+?>2BF-`Ac@skt}A
z6WSr{`c&Z2(b0phqIvkQ*|i>dw=VJ64${Y;pe(K@LluBO+nlex6!M8aY9zE<%5p6u
zGk?Hcz+6N4H|O;5fX1)p@=@EwoZABI_rXIfj?=tTM_fflTWI4G@3(X;q`2tt-T!_p
zo}WSy*LWht)pK1f(6);XU}-dTF6SMg_B3`#Oo|1Iz+CWs_Q5L@pT`2M>PnSL#m-)_
zU|m~uUZWH)EC%enn8X(15tzU`Sj)D=tba@FgKrW~Yu#LQ8EHu~AtolVxv&LR!UZ|$
zM6FhPoJI0lavyXB{=kCj=Az3;OPbOagO^bk*(|UU&Nyj`FVn#OO_H`498BWS7C2FJ
zQ$y~|ADmFd^ug(Pk5+vr)^%X+&L)fHDa7BZR;zE*ceQmLSakeOKEwO{(dz2z|9={H
z(|Q8jO~B-}A~5e>EhO2j?+pH+ddpzhA~5gW-vN$qxqh35;Xr!JVA&!tv-r-CRroAE
zZD(n6J$0oiZA2=VYnCkn@9yp{kZ_BH8I5B<@LAm9v*>;!^sASqw6Sr~ib-tpWf6F7
zZS7BrURHq;w}Od9OkxW>5m*7XqG<1#%>;#I#(&Yrg~+%s&1*`#EEX|Y;TB*eG#fsP
zMGD91@1T!A&imneO=%a!A|`9s0o&xQ=-&qJ^;6k*cla6r00960x8^DL00006Nkl<Z
Z0{~I$8iv%8;3fb7002ovPDHLkV1m~Pj5YuO

diff --git a/utils/index.js b/utils/index.js
index 6fdb424..4a0def3 100644
--- a/utils/index.js
+++ b/utils/index.js
@@ -259,6 +259,9 @@ export function assembleAddress(addressObj){
 	if(addressObj.areaId){
 		ids.push(addressObj.areaId)
 	}
+	if(addressObj.townshipId){
+		ids.push(addressObj.townshipId)
+	}
 	const names=[];
 	if(addressObj.countryName){
 		names.push(addressObj.countryName);
@@ -272,6 +275,9 @@ export function assembleAddress(addressObj){
 	if(addressObj.areaName){
 		names.push(addressObj.areaName);
 	}
+	if(addressObj.townshipName){
+		names.push(addressObj.townshipName);
+	}
 	resutlObj.ids=ids.join(",");
 	resutlObj.names=names.join(" ");
 	return resutlObj;

From 424166dce36f169fe120cb138638cb62b2657fbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E5=BD=A6=E7=A5=96?= <605893810@qq.com>
Date: Sat, 27 Sep 2025 15:52:05 +0800
Subject: [PATCH 02/12] =?UTF-8?q?feat:=E4=BF=AE=E6=94=B9apk=E7=AB=99?=
 =?UTF-8?q?=E5=86=85=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/home.vue                           | 24 +------------------
 pages/login_package/bind-phone/bind-phone.vue |  2 +-
 pages/login_package/register/register.vue     |  1 +
 .../mine_my_team/mine_my_team.vue             |  4 ++--
 pages/mine_package/mine_order/mine_order.vue  |  4 ++--
 5 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/pages/home/home.vue b/pages/home/home.vue
index 7730748..6f81765 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -235,29 +235,7 @@ export default {
 			currentLanguage: {},
 			yxProduct: [],// 好物优选列表
 			faddishProduct: [],// 爆款专区
-			hotList: [
-				{
-					id: 1,
-					name: "中文中文中文中文中文",
-					url: "/static/common/product_def.png",
-					price: 99,
-				}, {
-					id: 2,
-					name: "中文中文中文中文",
-					url: "/static/common/product_def.png",
-					price: 99,
-				}, {
-					id: 3,
-					name: "中文中文中文中文中文",
-					url: "/static/common/product_def.png",
-					price: 99,
-				}, {
-					id: 4,
-					name: "中文中文中文中文中文",
-					url: "/static/common/product_def.png",
-					price: 99,
-				},
-			],// 热门
+			hotList: [],// 热门
 			productLoading: false,
 			openShow: false,
 			platformType: null,// 当前设备信息
diff --git a/pages/login_package/bind-phone/bind-phone.vue b/pages/login_package/bind-phone/bind-phone.vue
index 562c9a8..4d631fc 100644
--- a/pages/login_package/bind-phone/bind-phone.vue
+++ b/pages/login_package/bind-phone/bind-phone.vue
@@ -248,7 +248,7 @@ export default {
 }
 
 .register_ifo_warp {
-  margin-top: 30rpx;
+  margin-top: 90rpx;
 
   .register_info_item {
     margin-bottom: 40rpx;
diff --git a/pages/login_package/register/register.vue b/pages/login_package/register/register.vue
index 17e2e07..1a92250 100644
--- a/pages/login_package/register/register.vue
+++ b/pages/login_package/register/register.vue
@@ -326,6 +326,7 @@ export default {
 .register_warp {
 	height: calc(100vh - 280rpx);
 	padding: 40rpx;
+	margin-top: 60rpx;
 }
 
 .register_title_warp {
diff --git a/pages/mine_package/mine_my_team/mine_my_team.vue b/pages/mine_package/mine_my_team/mine_my_team.vue
index 5769efb..c2a460c 100644
--- a/pages/mine_package/mine_my_team/mine_my_team.vue
+++ b/pages/mine_package/mine_my_team/mine_my_team.vue
@@ -75,7 +75,7 @@
 			<!-- 提成统计-->
 			<view class="royalty_warp">
 				<!-- 提成货币 -->
-				<view class="card_item_comm" @click="currencyShowCheck(true)" style="padding: 30rpx 30rpx 0;">
+				<view class="card_item_comm"  style="padding: 30rpx 30rpx 0;">
 					<view class="card_title_comm">
 						提成货币
 					</view>
@@ -124,7 +124,7 @@
 									<view class="royalty_data_">{{ formatDate(item.ctdate) }}</view>
 								</view>
 								<view>
-									<view class="royalty_title_ royalty_title_amount">{{ item.amount }}元</view>
+									<view class="royalty_title_ royalty_title_amount">{{ item.amount }}</view>
 									<view class="royalty_data_">{{ item.status ? "已结算" : "未结算" }}</view>
 								</view>
 							</view>
diff --git a/pages/mine_package/mine_order/mine_order.vue b/pages/mine_package/mine_order/mine_order.vue
index 9cb0457..4c212e0 100644
--- a/pages/mine_package/mine_order/mine_order.vue
+++ b/pages/mine_package/mine_order/mine_order.vue
@@ -60,10 +60,10 @@
                 </view>
               </view>
               <view class="content_item_yd" v-if="pItem.expressNo && pItem.expressData">
-                <view class="express-view text-overflow1">
+                <view class="express-view text-overflow1" v-if="Array.isArray(pItem.expressData?.logisticsTraceDetailList)">
 					<u-icon name="email" color="#333" size="20"></u-icon>
                   <text class="text-24 text-zu1 text-space" style="margin-left:10rpx;">{{pItem.expressData.logisticsStatusDesc}}</text>
-                  <text class="text-24 text-fu text-space text-overflow1" style="margin-left:10rpx;">{{pItem.expressData.logisticsTraceDetailList[0].desc}}</text>
+                  <text class="text-24 text-fu text-space text-overflow1" style="margin-left:10rpx;">{{Array.isArray(pItem.expressData?.logisticsTraceDetailList) ? pItem.expressData?.logisticsTraceDetailList[pItem.expressData.logisticsTraceDetailList.length - 1].desc : ''}}</text>
                 </view>
                 <!-- <view style="margin-left: 10rpx">
                   <up-image src="/static/common/copy.png" width="14" height="14" bgColor="#f1f6ff00"

From 428a70fac959d49137b54f6f49869a02df7e552c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E5=BD=A6=E7=A5=96?= <605893810@qq.com>
Date: Sat, 27 Sep 2025 17:17:34 +0800
Subject: [PATCH 03/12] =?UTF-8?q?feat=EF=BC=9A=E5=94=AE=E5=90=8E&=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=8A=A0=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/order.js                                 |   9 +
 pages/mine_package/mine_order/mine_order.vue | 267 ++++++++++++-------
 2 files changed, 174 insertions(+), 102 deletions(-)

diff --git a/api/order.js b/api/order.js
index 93c83b1..05760be 100644
--- a/api/order.js
+++ b/api/order.js
@@ -164,4 +164,13 @@ export function cancelOrder(data) {
 		method: "post",		
 		data,
 	});
+}
+
+// 删除订单
+export function deleteOrderQuery(data) {
+	return request({
+		url: "/order/deleteOrder",
+		method: "post",		
+		data,
+	});
 }
\ No newline at end of file
diff --git a/pages/mine_package/mine_order/mine_order.vue b/pages/mine_package/mine_order/mine_order.vue
index 4c212e0..9b3f6d0 100644
--- a/pages/mine_package/mine_order/mine_order.vue
+++ b/pages/mine_package/mine_order/mine_order.vue
@@ -60,10 +60,20 @@
                 </view>
               </view>
               <view class="content_item_yd" v-if="pItem.expressNo && pItem.expressData">
-                <view class="express-view text-overflow1" v-if="Array.isArray(pItem.expressData?.logisticsTraceDetailList)">
-					<u-icon name="email" color="#333" size="20"></u-icon>
-                  <text class="text-24 text-zu1 text-space" style="margin-left:10rpx;">{{pItem.expressData.logisticsStatusDesc}}</text>
-                  <text class="text-24 text-fu text-space text-overflow1" style="margin-left:10rpx;">{{Array.isArray(pItem.expressData?.logisticsTraceDetailList) ? pItem.expressData?.logisticsTraceDetailList[pItem.expressData.logisticsTraceDetailList.length - 1].desc : ''}}</text>
+                <view class="express-view text-overflow1" v-if="
+                  Array.isArray(pItem.expressData?.logisticsTraceDetailList)
+                ">
+                  <u-icon name="email" color="#333" size="20"></u-icon>
+                  <text class="text-24 text-zu1 text-space" style="margin-left: 10rpx">{{
+                    pItem.expressData.logisticsStatusDesc }}</text>
+                  <text class="text-24 text-fu text-space text-overflow1" style="margin-left: 10rpx">{{
+                    Array.isArray(pItem.expressData?.logisticsTraceDetailList)
+                      ? pItem.expressData?.logisticsTraceDetailList[
+                        pItem.expressData.logisticsTraceDetailList.length -
+                        1
+                      ].desc
+                      : ""
+                  }}</text>
                 </view>
                 <!-- <view style="margin-left: 10rpx">
                   <up-image src="/static/common/copy.png" width="14" height="14" bgColor="#f1f6ff00"
@@ -74,7 +84,7 @@
           </view>
           <!-- 汇总 -->
           <view class="order_item_collect">
-           <!-- <view class="collect_msg collect_msg_s" v-if="this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE">
+            <!-- <view class="collect_msg collect_msg_s" v-if="this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE">
               <view class="content_item_yd_msg">(快递动态跟进请复制单号至[快递100官网] 查询)</view> 
               <view>共{{ item.buyNum }}件,合计￥{{ item.sumAmount }}</view>
             </view> -->
@@ -89,12 +99,12 @@
 
               <view class="operate_comm operate_but_2" v-if="item.status === ORDER_TYPE.NOT_RECEIVE"
                 @click="confirmReceiptOk(item)">确认收货</view>
-				
-				<view class="operate_comm operate_but_1" style="borderColor: #7732FF;" v-if="form.type == 3"
-				  @click="onExpress(item.id,item.items.expressNo)">
-				  <text class="text-zi">查看物流</text>
-				</view>
-				
+
+              <view class="operate_comm operate_but_1" style="bordercolor: #7732ff" v-if="form.type == 3"
+                @click="onExpress(item.id, item.items.expressNo)">
+                <text class="text-zi">查看物流</text>
+              </view>
+
               <view class="operate_comm operate_but_2" v-if="
                 !isCheckSigne &&
                 index == 0 &&
@@ -113,7 +123,9 @@
                   ? 'operate_but_3'
                   : 'operate_but_1',
               ]" v-if="!item.isAfter && form.type !== MINE_ORDER_TYPE.AFTER_SALE" @click="onSaleAfter(item)">
-                {{ form.type === MINE_ORDER_TYPE.UNPAID ? "取消支付" : "售后" }}
+                {{
+                  form.type === MINE_ORDER_TYPE.UNPAID ? "取消支付" : "去售后"
+                }}
               </view>
 
               <view class="operate_comm operate_but_1" v-if="form.type === MINE_ORDER_TYPE.AFTER_SALE"
@@ -121,7 +133,12 @@
                 售后详情
               </view>
               <!-- <view class="operate_comm operate_but_1" v-if="item.status === ORDER_TYPE.AFTER_SALE">查看售后</view> -->
-              <!-- <view class="operate_comm operate_but_1" v-if="[ORDER_TYPE.COMPLETED].includes(item.status)">删除记录</view> -->
+              <view class="operate_comm operate_but_1 operate_comm_delete" v-if="
+                [
+                  MINE_ORDER_TYPE.SUCCEED,
+                  MINE_ORDER_TYPE.AFTER_SALE,
+                ].includes(form.type)
+              " @click="deleteOrder(item)">删除</view>
               <!-- <view class="operate_comm operate_but_3" v-if="[ORDER_TYPE.COMPLETED,ORDER_TYPE.CANCELED].includes(item.status)">再次购买</view> -->
             </view>
           </view>
@@ -187,7 +204,7 @@
               <up-image src="/static/common/kf_dh.png" width="40" height="40" bgColor="#f1f6ff00"></up-image>
             </view>
             <view class="content_info" @click="onKefu">
-              <view class="content_info_title" style="margin-top:20rpx">在线客服</view>
+              <view class="content_info_title" style="margin-top: 20rpx">在线客服</view>
               <!-- <view class="content_info_mobile">
                 {{ PHONE_NUMBER }}
                 <view style="margin-left: 20rpx">
@@ -242,11 +259,13 @@
 
     <u-modal :show="tipsShow" :showCancelButton="true" confirmText="去认证" @cancel="onTipsCancel" @confirm="onConfirm"
       confirmColor="#7934F6" title="提示" content="签署合同需要进行实名认证，请先完成实名认证"></u-modal>
-      
-    <DownPopup :show="downShow" @ok="onSignContract" @cancel="onCancel" />
 
-    <u-modal class="sure_pay" :show="surePayShow" title="提示" showCancelButton @cancel="surePayShow = false" @confirm="cancelPay" confirmColor="#7934F6"
-      content="确定取消支付吗？"></u-modal>
+    <DownPopup :show="downShow" @ok="onSignContract" @cancel="onCancel" />
+    <u-modal :show="deleteShow" title="提示" showCancelButton @cancel="deleteShow = false" @confirm="againDeleteOrder"
+      content="确定删除吗？"></u-modal>
+
+    <u-modal class="sure_pay" :show="surePayShow" title="提示" showCancelButton @cancel="surePayShow = false"
+      @confirm="cancelPay" confirmColor="#7934F6" content="确定取消支付吗？"></u-modal>
   </view>
 </template>
 
@@ -268,7 +287,8 @@ import {
   getMiniProgramSignUrl,
   afterSaleDetail,
   cancelOrder,
-  orderLogistics
+  orderLogistics,
+  deleteOrderQuery
 } from "@/api/order.js";
 import dayjs from "dayjs";
 import { formatDate1, copyData } from "@/utils/index.js";
@@ -354,15 +374,16 @@ export default {
       search: "",
       activeIndex: 0,
       aftterSalesProduct: {}, //售后商品信息
+      deleteShow: false,
+      deleteInfo: {}
     };
   },
   onLoad(options) {
     const type = options.type;
-    this.form.type =
-      type ? parseInt(type, 10) : MINE_ORDER_TYPE.UNPAID;
-	  this.$nextTick(()=>{
-		  this.loadData();
-	  })
+    this.form.type = type ? parseInt(type, 10) : MINE_ORDER_TYPE.UNPAID;
+    this.$nextTick(() => {
+      this.loadData();
+    });
     // 待收货判断是否签署
     if (
       this.form.type === MINE_ORDER_TYPE.NOT_RECEIVE ||
@@ -377,30 +398,29 @@ export default {
     getValue,
     formatDate1,
     copyData,
-	onExpress(itemId){
-		console.log('onExpress',itemId)
-		// let expressId = 
-		uni.navigateTo({
-			url:`/pages/rwa_package/setting/express?id=${itemId}`
-		})
-	},
+    onExpress(itemId) {
+      console.log("onExpress", itemId);
+      // let expressId =
+      uni.navigateTo({
+        url: `/pages/rwa_package/setting/express?id=${itemId}`,
+      });
+    },
     onNextRefund() {
       this.salesServer = 2;
 
       this.aftterSalesProduct = {
         ...this.aftterSalesProduct,
         ...{ afterReason: this.cancelForm.afterReason },
-
-      }
+      };
     },
     onSaleAfterTab() {
       this.checkType({ id: MINE_ORDER_TYPE.AFTER_SALE, title: "售后" });
     },
-	onKefu(){
-		uni.navigateTo({
-			url:'/pages/rwa_package/setting/kefu?type=5261'
-		})
-	},
+    onKefu() {
+      uni.navigateTo({
+        url: "/pages/rwa_package/setting/kefu?type=5261",
+      });
+    },
     // 售后
     onSaleAfter(item) {
       console.log("售后---1", item, this.form.type);
@@ -409,7 +429,6 @@ export default {
         // 取消支付
         this.cancelPayParams = { orderId: item.id };
         this.surePayShow = true;
-
       } else {
         // 未售后
         this.cancelForm.afterReason = "";
@@ -418,7 +437,8 @@ export default {
         this.aftterSalesProduct = item;
         this.afterShow = true;
         this.aftterSalesProduct.status = 9;
-        this.aftterSalesProduct.afterType = this.form.type == MINE_ORDER_TYPE.UNSHIPPED ? 1 : 2;
+        this.aftterSalesProduct.afterType =
+          this.form.type == MINE_ORDER_TYPE.UNSHIPPED ? 1 : 2;
       }
     },
     // 售后订单详情
@@ -453,9 +473,42 @@ export default {
       this.afterShow = false;
     },
 
+    // 删除
+    deleteOrder(item) {
+      console.log("删除", item);
+      this.deleteShow = true;
+      this.deleteInfo = item;
+    },
+    async againDeleteOrder() {
+      let params;
+      if (this.deleteInfo.status === 4) {
+        params = {
+          orderId: this.deleteInfo.id,
+          type: 1
+        }
+      }
+      if (this.deleteInfo.status === 7) {
+        params = {
+          orderId: this.deleteInfo.afterId,
+          type: 2
+        }
+      }
+      console.log("删除-1", params);
+      const res = await deleteOrderQuery(params);
+      if (res.bizcode == 100) {
+        this.$refs.uToastRef.show({
+          type: "success",
+          message: "删除成功",
+        });
+        this.deleteShow = false;
+        this.form.page = 1;
+        this.orderList = [];
+        this.loadData();
+      }
+    },
+
     // 取消支付
     cancelPay() {
-
       cancelOrder(this.cancelPayParams).then((res) => {
         if (res.bizcode == 100) {
           this.$refs.uToastRef.show({
@@ -548,30 +601,32 @@ export default {
     },
     // 加载数据的方法
     async loadData(type = null) {
-      console.log("加载数据的方法",type);
+      console.log("加载数据的方法", type);
       if (this.loading) return; // 如果正在加载，则不重复加载
       this.loading = true; // 设置加载状态为true
-	  if(type){
-		  this.form.page = 1;
-		  this.orderList = [];
-	  }
+      if (type) {
+        this.form.page = 1;
+        this.orderList = [];
+      }
       try {
         // 模拟异步获取数据，实际应用中应该替换为你的数据获取逻辑，例如API调用
-			const newData = await this.fetchData(
-			  this.form.page,
-			  this.form.pageSize
-			);
-			if (newData.entitys && newData.entitys.length !== 0) {
-			  this.orderList = [...this.orderList, ...newData.entitys]; // 将新数据添加到列表中
-			  this.form.page++; // 页码加1
-			  console.log("this.orderList", this.orderList);
-			}
-        
+        const newData = await this.fetchData(
+          this.form.page,
+          this.form.pageSize
+        );
+        if (newData.entitys && newData.entitys.length !== 0) {
+          this.orderList = [...this.orderList, ...newData.entitys]; // 将新数据添加到列表中
+          this.form.page++; // 页码加1
+          console.log("this.orderList", this.orderList);
+        }
       } catch (error) {
         console.error("加载数据失败:", error);
       } finally {
-			  console.log("this.orderList1111",JSON.parse(JSON.stringify(this.orderList)));
-			  this.$forceUpdate();
+        console.log(
+          "this.orderList1111",
+          JSON.parse(JSON.stringify(this.orderList))
+        );
+        this.$forceUpdate();
         this.loading = false; // 设置加载状态为false
       }
     },
@@ -587,41 +642,43 @@ export default {
       }
       const data = await getOrderList(params);
       if (data && data.bizcode === 100) {
-		  for(let i=0;i<data.data.entitys.length;i++){
-			  for(let j=0;j<data.data.entitys[i].items.length;j++){
-				  if(data.data.entitys[i].items[j].expressNo){
-				  		data.data.entitys[i].items[j].expressData = await this.getOrderLogistics(data.data.entitys[i].items[j].expressNo);
-				  }
-			  }
-		  }
-		  // data.data.entitys.forEach(item=>{
-			 //  if(item.items.length){
-				//   item.items.forEach(async (Iitem)=>{
-				// 	  if(Iitem.expressNo){
-				// 		  Iitem.expressData = await this.getOrderLogistics(Iitem.expressNo);
-				// 	  }
-				//   })
-			 //  }
-		  // })
-		  
+        for (let i = 0; i < data.data.entitys.length; i++) {
+          for (let j = 0; j < data.data.entitys[i].items.length; j++) {
+            if (data.data.entitys[i].items[j].expressNo) {
+              data.data.entitys[i].items[j].expressData =
+                await this.getOrderLogistics(
+                  data.data.entitys[i].items[j].expressNo
+                );
+            }
+          }
+        }
+        // data.data.entitys.forEach(item=>{
+        //  if(item.items.length){
+        //   item.items.forEach(async (Iitem)=>{
+        // 	  if(Iitem.expressNo){
+        // 		  Iitem.expressData = await this.getOrderLogistics(Iitem.expressNo);
+        // 	  }
+        //   })
+        //  }
+        // })
+
         return data.data;
       } else {
-        return '';
+        return "";
+      }
+    },
+    async getOrderLogistics(id) {
+      const params = {
+        mailNo: id,
+      };
+
+      const data = await orderLogistics(params);
+      if (data.bizcode == 100) {
+        return data.data;
+      } else {
+        return [];
       }
     },
-	async getOrderLogistics(id){
-		const params = {
-		  mailNo:id
-		};
-		
-		const data = await orderLogistics(params);
-		if(data.bizcode == 100){
-			return data.data;
-		}else{
-			return [];
-		}
-		
-	},
     // 当滚动到底部时触发的方法
     loadMore() {
       this.loadData(); // 加载更多数据
@@ -774,16 +831,17 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-	.express-view{
-		width:100%;
-		height:52rpx;
-		background-color: #f5f5f5;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		border-radius: 4rpx;
-		line-height: 1.6;
-	}
+.express-view {
+  width: 100%;
+  height: 52rpx;
+  background-color: #f5f5f5;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  border-radius: 4rpx;
+  line-height: 1.6;
+}
+
 .after-sales-popup {
   height: 400px !important;
 
@@ -862,7 +920,7 @@ export default {
 }
 
 .order_warp {
-  height: calc(100vh - env(safe-area-inset-bottom)); 
+  height: calc(100vh - env(safe-area-inset-bottom));
   background-color: $app-bj;
   padding: 100rpx 30rpx 30rpx;
   overflow-y: hidden;
@@ -1101,8 +1159,13 @@ export default {
   color: #ffffff;
 }
 
-.sure_pay{
- ::v-deep(.u-modal__content__text){
+.operate_comm_delete {
+  color: #f24a00;
+  border: 1rpx solid #f24a00;
+}
+
+.sure_pay {
+  ::v-deep(.u-modal__content__text) {
     text-align: center;
   }
 }

From f6b00cbe7e1822ec7217013d5f9f2fe756410cbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E5=BD=A6=E7=A5=96?= <605893810@qq.com>
Date: Sat, 27 Sep 2025 18:03:18 +0800
Subject: [PATCH 04/12] =?UTF-8?q?feat=EF=BC=9A=20=E6=9B=B4=E6=8D=A2?=
 =?UTF-8?q?=E6=96=87=E6=A1=88=E5=92=8C=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/rwa_package/shop/you-shop.vue | 2 +-
 pages/supply_chain/supply_chain.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/rwa_package/shop/you-shop.vue b/pages/rwa_package/shop/you-shop.vue
index fd7d07a..bd659e3 100644
--- a/pages/rwa_package/shop/you-shop.vue
+++ b/pages/rwa_package/shop/you-shop.vue
@@ -19,7 +19,7 @@
 import Header from '@/components/common/header.vue';
 import TopSafe from '@/components/common/top-safe.nvue'
 import MyBtn from '@/components/common/my-btn.vue'
-import YouItem from '@/components/shop/fen-item.vue'
+import YouItem from '@/components/shop/you-item.vue'
 import { searchList } from '@/api/product.js';
 import func from '@/utils/func.js';
 
diff --git a/pages/supply_chain/supply_chain.vue b/pages/supply_chain/supply_chain.vue
index f428636..231e575 100644
--- a/pages/supply_chain/supply_chain.vue
+++ b/pages/supply_chain/supply_chain.vue
@@ -65,7 +65,7 @@ export default {
   data() {
     return {
       dataList: [],
-      tabList: [{name:'全部'}],
+      tabList: [{name:'推荐'}],
       curTab: 0,
 	  upOption: {
 	  	auto: false,

From 1732dfb48b7006925807bdce4c42a557b68b0533 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E7=BE=A4?=
 <9079645+huang-zequn@user.noreply.gitee.com>
Date: Mon, 29 Sep 2025 14:27:40 +0800
Subject: [PATCH 05/12] =?UTF-8?q?feat:=20=E4=B9=9D=E5=AE=AB=E6=A0=BC?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=81=8F=E5=B7=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nine-grid/components/LotteryGrid.vue      | 216 ++++++++++--------
 1 file changed, 119 insertions(+), 97 deletions(-)

diff --git a/pages/other_package/nine-grid/components/LotteryGrid.vue b/pages/other_package/nine-grid/components/LotteryGrid.vue
index 032b2c4..56cd7ef 100644
--- a/pages/other_package/nine-grid/components/LotteryGrid.vue
+++ b/pages/other_package/nine-grid/components/LotteryGrid.vue
@@ -1,62 +1,77 @@
 <template>
   <!-- 九宫格容器 -->
-  <view>
-  </view>
+  <view> </view>
   <view class="lottery-grid">
     <!-- 高亮选中框 -->
-    <view class="highlight-box" :style="{
-      top: highlightTop,
-      left: highlightLeft,
-      transition: isRotating ? 'all 0.07s linear' : 'none'
-    }"></view>
-   
+    <view
+      class="highlight-box"
+      :style="{
+        top: highlightTop,
+        left: highlightLeft,
+        transition: isRotating ? 'all 0.07s linear' : 'none',
+      }"
+    ></view>
 
     <!-- 9个格子 -->
     <view class="grid-item" v-for="(item, index) in 9" :key="index">
       <!-- 中间格子作为抽奖按钮 (索引4) -->
       <template v-if="index === 4">
-        <image :src="prizesObj.prizes[index]?.iconUrl" class="prize-img-button" mode="widthFix"
-          @click="handleStartLottery(1)"></image>
+        <image
+          :src="prizesObj.prizes[index]?.iconUrl"
+          class="prize-img-button"
+          mode="widthFix"
+          @click="handleStartLottery(1)"
+        ></image>
       </template>
 
       <!-- 其他8个奖品格子 -->
       <template v-else>
-        <image :src="prizesObj.prizes[index]?.iconUrl" class="prize-img" mode="widthFix"></image>
+        <image
+          :src="prizesObj.prizes[index]?.iconUrl"
+          class="prize-img"
+          mode="widthFix"
+        ></image>
         <text class="prize-name">{{ prizesObj.prizes[index]?.name }}</text>
       </template>
     </view>
   </view>
-  <view class="coiled-lottery" v-if="prizesObj.times > 9" @click="handleStartLottery(10)"> 连续抽奖10次 </view>
+  <view
+    class="coiled-lottery"
+    v-if="prizesObj.times > 9"
+    @click="handleStartLottery(10)"
+  >
+    连续抽奖10次
+  </view>
 </template>
 
 <script>
-import { raffleExecute } from '@/api/raffle.js';
-import { getUserInfo } from '@/api/auth.js';
+import { raffleExecute } from "@/api/raffle.js";
+import { getUserInfo } from "@/api/auth.js";
 export default {
   props: {
     // 奖品数据数组
     prizesObj: {
       type: Object,
       required: true,
-      default: () => ({ prizes: [] })
+      default: () => ({ prizes: [] }),
     },
     // 是否禁用抽奖
     isDisabled: {
       type: Boolean,
-      default: false
+      default: false,
     },
 
     remainCount: {
       type: Number,
-      default: 0
-    }
+      default: 0,
+    },
   },
 
   data() {
     return {
       isRotating: false, // 是否正在旋转
-      highlightTop: '0rpx', // 高亮框顶部位置
-      highlightLeft: '0rpx', // 高亮框左侧位置
+      highlightTop: "0rpx", // 高亮框顶部位置
+      highlightLeft: "0rpx", // 高亮框左侧位置
       // 抽奖配置常量
       LOTTERY_PATH: [0, 1, 2, 5, 8, 7, 6, 3], // 抽奖路径顺序（顺时针）
       INITIAL_SPEED: 100, // 初始速度(ms) - 调慢以便观察
@@ -69,77 +84,82 @@ export default {
       animationTimer: null, // 动画计时器
       targetIndex: 0,
       currentPrize: [],
-      currentUserData:{}
-    }
+      currentUserData: {},
+    };
   },
   mounted() {
     this.getUserInfo();
   },
   methods: {
-       // 查询用户等级
-        async getUserInfo() {
-            const result = await getUserInfo();
-            if (result && result.bizcode === 100) {
-                const data = result.data;
-                this.currentUserData = result.data || {};
-            }
-        },
+    // 查询用户等级
+    async getUserInfo() {
+      const result = await getUserInfo();
+      if (result && result.bizcode === 100) {
+        const data = result.data;
+        this.currentUserData = result.data || {};
+      }
+    },
     /**
      * 移动高亮框到指定索引位置
      * @param {number} index - 格子索引
      */
     moveHighlight(index) {
-      const row = Math.floor(index / 3) // 计算行
-      const col = index % 3 // 计算列
-      this.highlightTop = `${row * 202}rpx`
-      this.highlightLeft = `${col * 202}rpx`
+      const row = Math.floor(index / 3); // 计算行
+      const col = index % 3; // 计算列
+      this.highlightTop = `${row * 194}rpx`; // 使用高度值194rpx而不是宽度值203rpx
+      this.highlightLeft = `${col * 203}rpx`; // 水平位置使用宽度值203rpx保持不变
     },
     /**
      * 执行抽奖动画
      * @param {Object} options - 动画参数
      */
     runAnimation(options) {
-      const { currentStep, speed, targetStep, cycleCount, totalSteps } = options
+      const { currentStep, speed, targetStep, cycleCount, totalSteps } =
+        options;
 
       // 清除之前的计时器
       if (this.animationTimer) {
-        clearTimeout(this.animationTimer)
+        clearTimeout(this.animationTimer);
       }
 
       // 计算下一步
-      const nextStep = (currentStep + 1) % this.LOTTERY_PATH.length
-      const nextTotalSteps = totalSteps + 1
-      let nextCycleCount = cycleCount
-      let nextSpeed = speed
+      const nextStep = (currentStep + 1) % this.LOTTERY_PATH.length;
+      const nextTotalSteps = totalSteps + 1;
+      let nextCycleCount = cycleCount;
+      let nextSpeed = speed;
 
       // 计算循环次数
       if (nextStep === 0) {
-        nextCycleCount++
+        nextCycleCount++;
       }
 
       // 速度控制逻辑
       if (nextCycleCount < 1 && nextTotalSteps < this.ACCELERATE_STEPS) {
         // 加速阶段
-        nextSpeed = Math.max(this.MIN_SPEED, nextSpeed - this.SPEED_DECREMENT)
+        nextSpeed = Math.max(this.MIN_SPEED, nextSpeed - this.SPEED_DECREMENT);
       } else {
         // 减速阶段
-        nextSpeed += this.SPEED_INCREMENT
+        nextSpeed += this.SPEED_INCREMENT;
       }
 
       // 移动高亮框到当前步骤位置
-      this.moveHighlight(this.LOTTERY_PATH[nextStep])
+      this.moveHighlight(this.LOTTERY_PATH[nextStep]);
 
       // 检查是否应该停止
       const shouldStop =
-        (nextSpeed > this.STOP_SPEED && nextStep === targetStep) || nextTotalSteps > this.MAX_STEPS
+        (nextSpeed > this.STOP_SPEED && nextStep === targetStep) ||
+        nextTotalSteps > this.MAX_STEPS;
 
       if (shouldStop) {
         // 动画结束
-        this.isRotating = false
-        this.animationTimer = null
+        this.isRotating = false;
+        this.animationTimer = null;
         // 触发抽奖完成事件，返回中奖奖品
-        this.$emit('complete', this.prizesObj.prizes[this.LOTTERY_PATH[nextStep]])
-        return
+        this.$emit(
+          "complete",
+          this.prizesObj.prizes[this.LOTTERY_PATH[nextStep]]
+        );
+        return;
       }
 
       // 继续下一帧动画
@@ -149,21 +169,19 @@ export default {
           speed: nextSpeed,
           targetStep,
           cycleCount: nextCycleCount,
-          totalSteps: nextTotalSteps
-        })
-      }, nextSpeed)
+          totalSteps: nextTotalSteps,
+        });
+      }, nextSpeed);
     },
 
-
-
     /**
-  * 处理开始抽奖事件
-  */
+     * 处理开始抽奖事件
+     */
     async handleStartLottery(num) {
-      if(this.currentUserData.contractStatus != 4){
-          uni.showToast({
+      if (this.currentUserData.contractStatus != 4) {
+        uni.showToast({
           title: `您当前尚未签署合同，请先签署合同再参与抽奖～`,
-          icon: 'none'
+          icon: "none",
         });
         return;
       }
@@ -171,7 +189,7 @@ export default {
       if (this.prizesObj.times <= 0) {
         uni.showToast({
           title: `您当前未获取到抽奖次数，快去获取吧～`,
-          icon: 'none'
+          icon: "none",
         });
         return;
       }
@@ -180,19 +198,24 @@ export default {
         return;
       }
 
-
       const params = {
         id: this.prizesObj.id,
         times: num,
-      }
+      };
       const { data } = await raffleExecute(params);
-      this.targetIndex = this.prizesObj.prizes.findIndex(ele => ele.id === data.idList[0]);
-      console.log("0------", this.prizesObj.prizes, data.idList, this.targetIndex)
+      this.targetIndex = this.prizesObj.prizes.findIndex(
+        (ele) => ele.id === data.idList[0]
+      );
+      console.log(
+        "0------",
+        this.prizesObj.prizes,
+        data.idList,
+        this.targetIndex
+      );
 
       this.currentPrize = data.prizeList;
 
-      this.handleStartClick(num)
-
+      this.handleStartClick(num);
     },
 
     /**
@@ -201,34 +224,32 @@ export default {
     handleStartClick(num) {
       // 如果正在抽奖或被禁用，则不执行
       if (this.isDisabled || this.isRotating) {
-        console.log('抽奖被禁用或正在进行中')
-        return
+        console.log("抽奖被禁用或正在进行中");
+        return;
       }
       // 减少抽奖次数
       if (this.remainCount <= 0) {
         uni.showToast({
-          title: '抽奖次数不足',
-          icon: 'none'
-        })
-        return
+          title: "抽奖次数不足",
+          icon: "none",
+        });
+        return;
       }
 
-
       // 标记为正在抽奖
-      this.isRotating = true
+      this.isRotating = true;
       // 通知父组件开始抽奖
-      this.$emit('start', num, this.currentPrize)
+      this.$emit("start", num, this.currentPrize);
 
       // 开始抽奖动画（无论父组件做了什么处理）
-      this.startLotteryAnimation()
+      this.startLotteryAnimation();
     },
     /**
      * 开始抽奖动画
      */
     startLotteryAnimation() {
       // 重置动画参数
-      clearTimeout(this.animationTimer)
-
+      clearTimeout(this.animationTimer);
 
       // 开始动画
       this.runAnimation({
@@ -236,18 +257,18 @@ export default {
         speed: this.INITIAL_SPEED,
         targetStep: this.targetIndex,
         cycleCount: 0,
-        totalSteps: 0
-      })
-    }
+        totalSteps: 0,
+      });
+    },
   },
   beforeDestroy() {
     // 组件销毁时清理计时器
     if (this.animationTimer) {
-      clearTimeout(this.animationTimer)
-      this.animationTimer = null
+      clearTimeout(this.animationTimer);
+      this.animationTimer = null;
     }
-  }
-}
+  },
+};
 </script>
 
 <style scoped>
@@ -267,14 +288,14 @@ export default {
   width: 203rpx;
   height: 194rpx;
   box-sizing: border-box;
-  border: 8rpx solid #FF4646;
+  border: 8rpx solid #ff4646;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
   position: relative;
   flex-shrink: 0;
-  background: linear-gradient(180deg, #FFF7E7 0%, #FFDAB2 100%);
+  background: linear-gradient(180deg, #fff7e7 0%, #ffdab2 100%);
   box-shadow: inset 0px 0 24rpx 0px rgba(255, 129, 9, 0.5);
   border-radius: 20rpx;
 }
@@ -313,7 +334,6 @@ export default {
 .prize-img-button {
   width: 100%;
   height: 100%;
-
 }
 
 .prize-name {
@@ -328,25 +348,27 @@ export default {
 
 .highlight-box {
   position: absolute;
-  width: 200rpx;
+  width: 203rpx;
   height: 194rpx;
   box-sizing: border-box;
-  border: 6rpx solid #FFDAB2;
+  border: 6rpx solid #ffdab2;
   background-color: rgba(255, 64, 129, 0.4);
   z-index: 1;
   pointer-events: none;
   border-radius: 20rpx;
-  /* 增加高亮动画效果 */
-  /* box-shadow: 0 0 15rpx 2rpx rgba(255, 64, 129, 0.5); */
-
-  /* background: linear-gradient(180deg, #FFF7E7 0%, #FFDAB2 100%); */
   box-shadow: inset 0px 0 24px 0px rgba(255, 129, 9, 0.5);
 }
 
 .coiled-lottery {
   width: 670rpx;
   height: 88rpx;
-  background: linear-gradient(180deg, #FFE361 0%, #FF7B21 70%, #FFB931 91%, #FFB245 100%);
+  background: linear-gradient(
+    180deg,
+    #ffe361 0%,
+    #ff7b21 70%,
+    #ffb931 91%,
+    #ffb245 100%
+  );
   box-shadow: inset 0px 0 24rpx 0px rgba(255, 255, 255, 0.5);
   border-radius: 44rpx;
   margin: 120rpx auto 0;
@@ -355,6 +377,6 @@ export default {
   justify-content: center;
   font-weight: 500;
   font-size: 32rpx;
-  color: #FFFFFF;
+  color: #ffffff;
 }
-</style>
\ No newline at end of file
+</style>

From 5a3dd472eec94e3a4146ac1d19bd29c398366908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E5=BD=A6=E7=A5=96?= <605893810@qq.com>
Date: Mon, 29 Sep 2025 15:56:36 +0800
Subject: [PATCH 06/12] =?UTF-8?q?feat=EF=BC=9A=20ios=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                       | 2 +-
 pages/login_package/login/login.vue | 4 ++--
 utils/config.js                     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifest.json b/manifest.json
index b9107a1..14dc47a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "appid" : "__UNI__4910728",
     "description" : "信任桥优品是一款集线上商城、线下联盟商家的DAO聚合商城；通过“有趣”“有利”“有希望”的卖货玩法，吸引消费者、推广者、商家、投资人参与生态，共同打造共创共享的全球产业生态。",
     "versionName" : "1.0.1",
-    "versionCode" : 132,
+    "versionCode" : 133,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/login_package/login/login.vue b/pages/login_package/login/login.vue
index 76843ae..91bfa35 100644
--- a/pages/login_package/login/login.vue
+++ b/pages/login_package/login/login.vue
@@ -92,7 +92,7 @@
         <view @click="jumpRegister">注册</view>
       </view>
     </view>
-    <view v-if="!isIOS">
+    <view >
       <view class="other_login">其他登录方式</view>
       <view class="login_other_icon">
         <view class="login_other_item" @click="wechatOneLogin">
@@ -104,7 +104,7 @@
           ></up-image>
           微信登录
         </view>
-        <view class="login_other_item" @click="alipayOneLogin">
+        <view v-if="!isIOS" class="login_other_item" @click="alipayOneLogin">
           <up-image
             src="/static/login/ZFB.png"
             width="44"
diff --git a/utils/config.js b/utils/config.js
index c78487b..7e63461 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -2,9 +2,9 @@
 // export const BASE_URL="https://frontend.jdns360.com/api"; // 正式环境
 // export const BASE_URL="http://cl55un59859.vicp.fun:24346"; // 测试环境
 
-// export const BASE_URL = "https://api.tbmall.xin"; //生产
+export const BASE_URL = "https://api.tbmall.xin"; //生产
 // export const BASE_URL ='http://api.hm.a-d.work:6880' // 测试
-export const BASE_URL ='http://api.outer.tbmall.xin:6880' // 本地测试
+// export const BASE_URL ='http://api.outer.tbmall.xin:6880' // 本地测试
 
 
 

From d04b889ee8826585afcfafd02f1e63f0ca5d087c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E5=BD=A6=E7=A5=96?= <605893810@qq.com>
Date: Mon, 29 Sep 2025 20:30:27 +0800
Subject: [PATCH 07/12] =?UTF-8?q?feat:=20=E5=8A=A0=E7=89=B9=E4=BE=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/shop/you-item.vue        | 3 ++-
 manifest.json                       | 2 +-
 pages/rwa_package/shop/you-shop.vue | 1 -
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/shop/you-item.vue b/components/shop/you-item.vue
index f380bdb..427dfab 100644
--- a/components/shop/you-item.vue
+++ b/components/shop/you-item.vue
@@ -5,8 +5,9 @@
 		</view>
 		<view class="shop-right-view">
 			<view class="right-top-view text-overflow1">
-				<text class="text-32 text-bold text-zu text-overflow1">{{obj.title}}</text>
+				<text class="text-32 text-bold text-zu text-overflow1">{{obj.title}}</text> 
 			</view>
+			<view class="text-24" style="color:#FF5A5A;" v-if="obj.tag">特供</view>
 			<view class="right-bottom-view">
 				<view class="flex-c-lr" style="height:70rpx">
 					<text class="text-24 text-fu">原价</text>
diff --git a/manifest.json b/manifest.json
index 14dc47a..c2178d2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -3,7 +3,7 @@
     "appid" : "__UNI__4910728",
     "description" : "信任桥优品是一款集线上商城、线下联盟商家的DAO聚合商城；通过“有趣”“有利”“有希望”的卖货玩法，吸引消费者、推广者、商家、投资人参与生态，共同打造共创共享的全球产业生态。",
     "versionName" : "1.0.1",
-    "versionCode" : 133,
+    "versionCode" : 134,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/rwa_package/shop/you-shop.vue b/pages/rwa_package/shop/you-shop.vue
index bd659e3..f3d0926 100644
--- a/pages/rwa_package/shop/you-shop.vue
+++ b/pages/rwa_package/shop/you-shop.vue
@@ -21,7 +21,6 @@ import TopSafe from '@/components/common/top-safe.nvue'
 import MyBtn from '@/components/common/my-btn.vue'
 import YouItem from '@/components/shop/you-item.vue'
 import { searchList } from '@/api/product.js';
-import func from '@/utils/func.js';
 
 export default {
 	components: { Header, TopSafe,MyBtn,YouItem },

From 356ed6c4068f47fc2178baac417323dac1787962 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E7=BE=A4?=
 <9079645+huang-zequn@user.noreply.gitee.com>
Date: Tue, 30 Sep 2025 16:04:16 +0800
Subject: [PATCH 08/12] =?UTF-8?q?feat:=20=E7=89=B9=E4=BE=9B=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E6=8D=A2=E6=88=90=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/shop/you-item.vue                    |   6 ++++--
 pages/other_package/productInfo/productInfo.vue |   7 ++++++-
 static/shopping/tg.png                          | Bin 0 -> 3158 bytes
 3 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 static/shopping/tg.png

diff --git a/components/shop/you-item.vue b/components/shop/you-item.vue
index 427dfab..f2676a2 100644
--- a/components/shop/you-item.vue
+++ b/components/shop/you-item.vue
@@ -7,9 +7,11 @@
 			<view class="right-top-view text-overflow1">
 				<text class="text-32 text-bold text-zu text-overflow1">{{obj.title}}</text> 
 			</view>
-			<view class="text-24" style="color:#FF5A5A;" v-if="obj.tag">特供</view>
 			<view class="right-bottom-view">
-				<view class="flex-c-lr" style="height:70rpx">
+				<view class="flex-c-lr" >
+					<view class="text-24" style="color:#FF5A5A;width: 112rpx;height: 32rpx;" v-if="obj.tag">
+						<image src="/static/shopping/tg.png"  style="width: 112rpx;height: 32rpx;"></image>
+					</view>
 					<text class="text-24 text-fu">原价</text>
 					<text class="text-24 text-fu text-d text-bold">￥{{obj.adPrice}}</text>
 				</view>
diff --git a/pages/other_package/productInfo/productInfo.vue b/pages/other_package/productInfo/productInfo.vue
index 07bb71e..68ef7a2 100644
--- a/pages/other_package/productInfo/productInfo.vue
+++ b/pages/other_package/productInfo/productInfo.vue
@@ -20,12 +20,17 @@
         <view class="product_content_warp">
             <!-- 标题，系列 -->
             <view class="content_data">
-                <view class="content_data_price">
+                <view style="display: flex;align-items: center;justify-content: space-between;">
+                    <view class="content_data_price">
                     <text>￥</text>
                     <text style="font-size: 60rpx" v-if="orderInfo.minPrice && orderInfo.maxPrice">{{ orderInfo.minPrice }} - {{ orderInfo.maxPrice }}</text>
                     <text style="font-size: 60rpx" v-else>{{ orderInfo.minPrice }}</text>
                     <text class="price_o">￥{{ orderInfo.adPrice }}</text>
                 </view>
+                <view class="text-24" style="color:#FF5A5A;width: 120rpx;height: 38rpx;" v-if="orderInfo.tag">
+                    <image src="/static/shopping/tg.png"  style="width: 120rpx;height: 38rpx;"></image>
+                </view>
+                </view>
                 <view class="content_data_title">
                     {{ orderInfo.name }}
                 </view>
diff --git a/static/shopping/tg.png b/static/shopping/tg.png
new file mode 100644
index 0000000000000000000000000000000000000000..a0261c0550828cb9171916cb66f2bd48eefcbf0d
GIT binary patch
literal 3158
zcmV-c45{;pP)<h;3K|Lk000e1NJLTq003|R001Be1^@s6%5MC;00001b5ch_0Itp)
z=>Px>5J^NqRA@u(TM2MfMH>G4T{F21Bpi`L5kskXtbm|`2yPS<wGv?!6eEWxf<hI$
zrCTcNQi~Sq8dwwsRs^xsponX!xC$O<Km-LrK?Ffa2qE{7YcliR>#e_gu1qE~2^mmf
z|Ej5(dGGIj-T&AB+5H&eNY%xj0btrn0KMbbZPczf=dFGeW31J@zXQfX8|>b=&8W1L
zCmR;u383fko_r+Gq5&BW+(`svVcY<8mGC^y`HZ%LM}iOigtsSQD~cj6({Ddep@7BG
zLO)=kz@020#s$FYGTt91{~CbW8UV|8aabMzoWrJ%ZNau}36cVIJlB-nFa}joplTX4
zRSR@oQ(>d<doJ3m29S9v!@(Uk>Z_VRJ*5*v_r6Sk9}49E0rbgg<w~xO7|J&R7|<H<
zh-c$JEx0RN=FZG@A)&J+1Wv#i4hM8i4`|{?3r+0!SOR{*)eM7gWmr1JhDnPej7Cgj
z=sR2q02mHrYsdUs<!iSFx{CR9&iK5xOt5I9jjEpk(!@xVKA;X=2G>drR8=?~PB<J+
z@w=`X`1ieDSYFal;PyP=$MwLLx10BroDNJ_0H`{H!kUA4GH7AD0IaXzJv<%}xTLfN
zK;mtv;P~oUsYT(Wr&!3GP%Z#siUNn>fWzq&TDakL8=Kye?amqiTr<tavZ)N7`sPy^
zl53;i^|B8?faFj8T6oF>SY2$d218C;!SnNPS!ki=P~_HUj;TaqH?Pn_P1A%HGTXq?
zDID%v*=F?LY!v?pe3dVQoKSKkapeBXgpt6YsH!l(1Y#rrOZM8ZEg&%!=#UZYtD?w8
zV_mRUXEKo1z4^2J93D3Z#ao^Rpsp%tU7RTlMgmZMICxEWM(?Y&GCgJuJX*rDZO-3m
z?Smrm9sJV9&ub!^(T*3@BV$;NXhuROKltM(2G%cAz`)QolOy|43o9N}(Qvf+H2UY5
z7&yifZOQZs5PblGGq~$yR7<hZbGLiIZD7z%Dz2Om43;P`TKO2+YDs?>so<I^df@-j
za*lnQZO{TJ*~3v$#BtY)26P9o<X#WFZpnJ-pHvJUr{d)Yya5n1FH?~7aImjqmE$o1
z$V+*$D-JoI+r_c*smNwjO|Z~sayg)IDQHE<%7+cqmFZwi!N}<rYAZPkRs;p^7lLYV
z-1@8=NvTrf!U3cO@Y4NWxQ;*wcEcN%XgXr5h70~kf|h`q9*)|OV2d=+nan`Gb=({S
zU%YB!(_6AF5iN!pD;=;cj(KBcA4DS`&~RavibZ#OP*Wxs?7*8;3=3H-CltVA&G{k?
z^4rB0Tn8c#zh`zOlFsmm-0#3QDn5D9fTlRmp{t6qb4|SdXAQL#&DUVxEH4J%;f1QG
zLGTDjMHP#|HW?O-_lR%O4nGJt{zXGZ9|g;2$Z(bdB@rz7h|C_PIX(I+82zY@_w&5i
z^OX&=Q8J`;XBa+N!}?cDlphFMmJS&VjwGOTALYD~mli?)>s1UI-FyMI1<W>UU|Vy(
zSc9R6bkBQ{&1mX*4amr<76868hoS0#0gX8^Y?1=a06tsNeDWmVo1dyjY8M%KlJ<pb
z;Gta{`H%Q=&5!|Je6513?+co>wTr#j_Ce4>OnOd7dXJzFBn``d%!8sI<oJ7E!o&jD
z@On@yqs@Q#Bo&urpFjYQCFhF;pr?kTV6F{Bz)&%4oIUvn4)3+`-qRc^Gmvtc6S?yg
zygkc+tEBn*JNq&(uA1U)5j@hs&8uyEvBJV>otX$WEE7;PVAKpv__CS`IT!-E*7uwK
z_qj|Fe2zq5#QhTJ7biCc%<O<0RSX%g;+uCZ6uc%uB!77K5(E3cwXtSiaM4U$po271
z)7z{=O+?zJ)~*sho%6Qke6awe``cc!P_-{IXSeGr@x^;}IQSi)G7W=r9O&B1z`ExR
znFxka&g=$s?uDiRD!wSxmqM(bV`ASH8&}<_;qzsth(OcNV3;`Hz=GQvMHCs0GBO!%
zf5w2<%`tymuzHYnw}yV#s|eNH&b=5W%rmg%T??Nrl>ic`55D1`0K47P>Mq)o^Tirv
z@n(+Q@3auibZNla|CR|2)eRNnpVqK$eiEvR3=xfnQjZHwjGWmhd|hbp;{Wf@|2|)4
z!ClL7&JYEwW=o-FUaBDbVI8iLrlz3kupQtbz8hw0=yAS+<TQq|Uu-O&5p<GcX6ZPq
zzk;_O_u`jraz1@7SCIXXj<t)t*tSMq^Me{oF0HxWY5?1t^F<qsx1OWmNjng=h4NZ9
zN5S?Y(Dyk*f!_Tze7Z0h8lx55G$$MNPy@R4<xPT@Q1C*F;`9tMYpZ5U04~W<F?^yX
z{`>Pxy6$P<s3;7AO2Q`)(|an|v(dtT<_68;pwTM!e`BNSFb|aVoGCy`8iT8h!&5J3
zM!`^rt_)Y-r=k0KE$5YS127&rU#!7=x7<eMPmzO}o%_piq`DrXXW7{Jnt{rF3D6WL
z6h^gkxduD+wvau`Ej2GB`V7}TiYhA)anzIpy9+Gr{7h;EMTIxa)UoRC-X`wYHX%%`
zpEL(>&te0KsSIDQHnD!Wys4<bxkHsef3fCE_wRf`N5|8TGl22R`C?6|WGlxmUx_T7
zx5Cwc>ZDSfpJn62c@&8{peqSb6g^-@v!=Om)<8R^_7Pxf<~NT(>6v#eGElZpE~1pq
zKt`s5b&I{&>Wf4>ohkjKpFUdX#rBWn0_bo$!-PCtB=37S1>Hfn^O&$Khj;rHCxbBE
zL`EX*ki?Qq^!qWJ$1~@PHWbs%@#PaXc!UU?ww#i#JcRE)wotrF5z(loBtT;Z7*mm&
zVPnjb4N%qS+DATc$68ASFe#mYpEuhgnJ2m<Pe<oo3SOS(5gMA_gJIHh23F1XVE?yL
z_~a*Z{u)d(@*ne}aEGrh+g}0sz|dfYa=&|)7{a8!Iy2}iCqJ)8Ey=Y7(x?E&JLiiv
zupO`3E$&d@%nE$ES{5c1rbAbp0W*5Vq(+=O+zy&gO$+=E-w+NR!_uh|EXpaT=gX*Y
z{R$Ibuac{X1iktnrT~CwV2+Am6N7o%qPrS}DJJSSO2N=vO_b0Yj>>D7k5w_`R!x}T
z1>+k7rL~b$HC%X2tF}&Ki7Y}K?rU;9a=uujIkKH&XMW^pw7S-ftv{8DE=cR78FeB#
zO~bfn+|Z2J+86qKGHZFaG=h9wdQXN)3#4hRtLCC&LgcRF_#n>=1Xm;O*KpAYDR?Tg
z&8Kpi&oWX<(pbj>WjQKdldq&gHqo1pdvIWzWWFFv!L<*xzYZ#7(UMS)SI!p=M9U-1
zs2x(i^7B(QX2bWz@Ob4$uQa1hTs~I8#WzUb7oIvq(>_-z$C7(w4tMrIhMOJ<`Zl_D
zaJ!AS=Xe8UvQB3(+%{JiyBkCmg|;Y8`{}v|HLP1=269M>NUyvjsI43GO%(VlG#$G!
z+_|vn^I|RTmhMLc@Ob8Yu?G6X8x~4;MCRIis0xKgd^;3OM^dr_<DUf*Q?zDv&+x6I
z@E*O5Jg_rB1!_8a5la3F4PB!xqU7|Z_o@9+UtyYf5>I1Iww{vH0L>9>L+MC;b?^xk
z^u&WA_HsOPzF31U`+?*8*CLzI+J;7K-X)_BGNb)R(Kd|^LpQ{pq1f}I+NZB*eKKv_
zwps&EM9votMDj^rK4HP~RrtesH|;D&z1tKu#9N*K(z?jw7P_vtxN#e6(fpq8H_^Zo
zmGi|C*seEil=vKeIPZbdYV0dIigT{uxFVOq=}16A0s&|=*|a?sv`<)~PywB&oG%uD
z6}vgMzY^JudYKm+ww7Sb-#JpdGNFA5bY8}Ah!br7z$NtbS*+*%p6>?$^c{<*<AL!>
zP}(6C%9{$Fv|zTdE6{Ly1^V4=iYknz>*CN8`9a$E3)Q@n;m}enF$w^Gjhrvmz^K4Y
zRT;{hY|DaanXqgsc-vsQ4MpeTp1<x%+826YNd`LciS%NP_1C;FW>|Tck5a(j|1}2^
zHLxMz!j9nkkJI}#&JUg+xKjbVfDd#P^O2nK4}YrwhQALH>0OBM_a9CX0OiXqoO9+n
wV!r^+aw#YMEdm+qWtNli#g!O1h}X;h2Zv?eHGEt@RsaA107*qoM6N<$f{iix`v3p{

literal 0
HcmV?d00001


From 77902b94c60f832e6321954941a0190346fbfc7f Mon Sep 17 00:00:00 2001
From: dongjian <315328220@qq.com>
Date: Fri, 10 Oct 2025 14:42:35 +0800
Subject: [PATCH 09/12] no message

---
 pages/other_package/productInfo/productInfo.vue | 15 ++++++++++-----
 utils/config.js                                 |  4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pages/other_package/productInfo/productInfo.vue b/pages/other_package/productInfo/productInfo.vue
index 68ef7a2..9aec6d7 100644
--- a/pages/other_package/productInfo/productInfo.vue
+++ b/pages/other_package/productInfo/productInfo.vue
@@ -163,7 +163,7 @@
                                 :class="oItem.inventory === 0 ? 'item_Warp item_Warp_no_warp' : item.selectVal === oItem.n ? 'item_Warp item_Warp_yes_warp' : 'item_Warp'"
                                 v-for="(oItem, oIndex) in item.items"
                                 :key="oItem.n"
-                                @click="clickSpecification(index,item, oItem)"
+                                @click="clickSpecification(oIndex,item, oItem)"
                             >
                                 {{ oItem.n }}
                             </view>
@@ -439,18 +439,23 @@ export default {
         },
         //改变规格的样式
         clickSpecification(pIndex,item, oItem) {
-            console.log("改变规格的样式",item,oItem,this.specificationTempl)
+            console.log("改变规格的样式",pIndex,item,oItem,this.specificationTempl,this.specificationList)
 
-           const currentSelectSpecification = this.specificationTempl.find(ele=>ele.combTypes == item.type && ele.combNames == oItem.n);
+           const currentSelectSpecification = this.specificationTempl[pIndex];
+		   
            console.log("当前规格",currentSelectSpecification)
            this.orderInfo.quantity = currentSelectSpecification?.minBuyNum || 1;
 
-            this.specificationList[pIndex].selectVal = oItem.n;
+            this.specificationList[0].selectVal = oItem.n;
+			
+			this.selectSpecificationTempl = currentSelectSpecification;
+			this.orderInfo.inventory = currentSelectSpecification.stock; // 库存
             // 计算规格的价格
-            this.selectSpecificationFun(pIndex, oItem);
+            // this.selectSpecificationFun(pIndex, oItem);
         },
         // 选择规格
         selectSpecificationFun(index, item) {
+			console.log('selectSpecificationTempl',)
             const currentSelectSpecification = this.selectSpecification;
             currentSelectSpecification[index] = item.n;
             this.selectSpecification = currentSelectSpecification;
diff --git a/utils/config.js b/utils/config.js
index 7e63461..c78487b 100644
--- a/utils/config.js
+++ b/utils/config.js
@@ -2,9 +2,9 @@
 // export const BASE_URL="https://frontend.jdns360.com/api"; // 正式环境
 // export const BASE_URL="http://cl55un59859.vicp.fun:24346"; // 测试环境
 
-export const BASE_URL = "https://api.tbmall.xin"; //生产
+// export const BASE_URL = "https://api.tbmall.xin"; //生产
 // export const BASE_URL ='http://api.hm.a-d.work:6880' // 测试
-// export const BASE_URL ='http://api.outer.tbmall.xin:6880' // 本地测试
+export const BASE_URL ='http://api.outer.tbmall.xin:6880' // 本地测试
 
 
 

From c6f292ed2293576c524bf6a03dabd8e9576a6742 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E7=BE=A4?=
 <9079645+huang-zequn@user.noreply.gitee.com>
Date: Sat, 11 Oct 2025 17:35:13 +0800
Subject: [PATCH 10/12] =?UTF-8?q?feat:=20=E9=94=81=E5=AE=9A=E8=B4=A6?=
 =?UTF-8?q?=E6=88=B7=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=A0=87=E4=BB=B7=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/mine_package/mine_purse_log/mine_purse_log.vue | 8 ++++----
 pages/rwa_package/dongjian/components/shop-item.vue  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pages/mine_package/mine_purse_log/mine_purse_log.vue b/pages/mine_package/mine_purse_log/mine_purse_log.vue
index f223fa6..0794068 100644
--- a/pages/mine_package/mine_purse_log/mine_purse_log.vue
+++ b/pages/mine_package/mine_purse_log/mine_purse_log.vue
@@ -152,7 +152,7 @@ export default {
 					key: "cur"
 				},
 				{
-					name: "锁定次数",
+					name: "锁定账户",
 					key: "lockAmount"
 				},
 
@@ -218,7 +218,7 @@ export default {
 					key: "cur"
 				},
 				{
-					name: "锁定次数",
+					name: "锁定账户",
 					key: "lockAmount"
 				},
 
@@ -346,7 +346,7 @@ export default {
 			if (item.key === "cur") {
 				id = this.curId;
 			}
-			if (item.key === "lock") {
+			if (item.key === "lockAmount") {
 				id = this.lockId;
 			}
 			if (item.key === "pre") {
@@ -400,7 +400,7 @@ export default {
 			if (selInfo === "cur") {
 				id = this.curId;
 			}
-			if (selInfo === "lock") {
+			if (selInfo === "lockAmount") {
 				id = this.lockId;
 			}
 			this.form.id = id;
diff --git a/pages/rwa_package/dongjian/components/shop-item.vue b/pages/rwa_package/dongjian/components/shop-item.vue
index 5c5a98c..3fdd933 100644
--- a/pages/rwa_package/dongjian/components/shop-item.vue
+++ b/pages/rwa_package/dongjian/components/shop-item.vue
@@ -6,9 +6,9 @@
 		<view class="bottom-shop-view">
 			<text class="text-28 text-zu text-overflow1">{{obj.title}}</text>
 			<text class="text-28" style="color:#FF4242">
-				￥{{obj.adPrice}}
+				￥{{obj.price}}
 				<text class="text-24 text-fu text-d" style="margin-left:12rpx">
-					￥{{obj.price}}
+					￥{{obj.adPrice}}
 				</text>
 			</text>
 		</view>

From 1396a68d6bde1350a21cd5ed02d3fe3e7b77294b Mon Sep 17 00:00:00 2001
From: dongjian <315328220@qq.com>
Date: Tue, 14 Oct 2025 13:59:41 +0800
Subject: [PATCH 11/12] no message

---
 components/custom-tab-bar.vue                    |   5 ++++-
 pages.json                                       |   8 ++++----
 pages/mine/mine.vue                              |   2 +-
 .../nine-grid/components/LotteryGrid.vue         |   1 +
 pages/rwa_package/dongjian/check.vue             |   2 +-
 pages/rwa_package/dongjian/jia.vue               |   6 +++++-
 static/new/shouhou.png                           | Bin 0 -> 1557 bytes
 7 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 static/new/shouhou.png

diff --git a/components/custom-tab-bar.vue b/components/custom-tab-bar.vue
index a939c63..fdb412a 100644
--- a/components/custom-tab-bar.vue
+++ b/components/custom-tab-bar.vue
@@ -93,6 +93,8 @@ export default {
   bottom: 0;
   width: 100%;
   padding-bottom: calc(env(safe-area-inset-bottom));
+  box-sizing: border-box;
+  border-top:2rpx solid #eaeaea;
   &.iosplatformType {
     height: 100rpx;
     padding-bottom: 0;
@@ -115,10 +117,11 @@ export default {
 
 .tab-text {
   font-size: 24rpx;
+  color:#666;
   /* 文字大小 */
 }
 
 .tab-text-sel {
-  color: $app-bt-bj;
+  color: #7934F6;
 }
 </style>
diff --git a/pages.json b/pages.json
index 94b44f3..eb99491 100644
--- a/pages.json
+++ b/pages.json
@@ -520,11 +520,11 @@
 		]
 	}],
 	"tabBar": {
-		// "color": "#000000",
-		// "selectedColor": "#03AD27",
-		// "borderStyle": "black",
+		"color": "#666",
+		"selectedColor": "#7934F6",
+		"borderStyle": "black",
 		// "backgroundColor": "#F8F8F8",
-		"custom": true,
+		// "custom": true,
 		"list": [{
 				"pagePath": "pages/home/home",
 				"text": "%index.home%",
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index ff033ea..f2c46f1 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -370,7 +370,7 @@ export default {
         {
           id: ORDER_TYPE.AFTER_SALE,
           title: "售后",
-          url: "/static/mine/order_afterSale.png",
+          url: "/static/new/shouhou.png",
           path:
             "/pages/mine_package/mine_order/mine_order?type=" +
             MINE_ORDER_TYPE.AFTER_SALE,
diff --git a/pages/other_package/nine-grid/components/LotteryGrid.vue b/pages/other_package/nine-grid/components/LotteryGrid.vue
index 56cd7ef..fd226cd 100644
--- a/pages/other_package/nine-grid/components/LotteryGrid.vue
+++ b/pages/other_package/nine-grid/components/LotteryGrid.vue
@@ -362,6 +362,7 @@ export default {
 .coiled-lottery {
   width: 670rpx;
   height: 88rpx;
+  min-height:88rpx;
   background: linear-gradient(
     180deg,
     #ffe361 0%,
diff --git a/pages/rwa_package/dongjian/check.vue b/pages/rwa_package/dongjian/check.vue
index 9582fd9..fd1b8b5 100644
--- a/pages/rwa_package/dongjian/check.vue
+++ b/pages/rwa_package/dongjian/check.vue
@@ -52,7 +52,7 @@ export default {
 				{ text: '合同编号', value: '' },
 				{ text: '发起方', value: '信任桥（深圳）网络科技有限公司' },
 				{ text: '发起时间', value: '' },
-				{ text: '完成结束时间', value: '' },
+				{ text: '完成时间', value: '' },
 			],
 			bottomList: [
 				{ text: '签约人', value: '信任桥会员 章三' },
diff --git a/pages/rwa_package/dongjian/jia.vue b/pages/rwa_package/dongjian/jia.vue
index 8f71ce6..d8008d3 100644
--- a/pages/rwa_package/dongjian/jia.vue
+++ b/pages/rwa_package/dongjian/jia.vue
@@ -101,7 +101,11 @@ export default {
 			this.getQuichens()
 		},
 		getQuichens() {
-			quickens().then(res => {
+			let params  ={
+				page:1,
+				pageSize:1000
+			}
+			quickens(params).then(res => {
 				if (res.bizcode == 100) {
 					// this.type = res.data;
 					this.tList[0].text = res.data.vcoinsLock;
diff --git a/static/new/shouhou.png b/static/new/shouhou.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd748540599e336aa43ed148aad2ea6cc2c93946
GIT binary patch
literal 1557
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
Hu0mjfgE`?#

literal 0
HcmV?d00001


From cb6a7710f32b976b0c4bb5bbb2199e8b11f29ec7 Mon Sep 17 00:00:00 2001
From: dongjian <315328220@qq.com>
Date: Thu, 16 Oct 2025 17:33:22 +0800
Subject: [PATCH 12/12] no message

---
 components/shop/fen-item.vue                  |   2 +-
 pages/home/home.vue                           |   2 +-
 .../mine_purse_log/mine_purse_log.vue         |   5 +--
 pages/rwa_package/dongjian/finance.vue        |  34 ++++++++++++------
 pages/rwa_package/rwa/rwa.vue                 |   2 +-
 .../rwa_withdrawal/rwa_withdrawal.vue         |   4 +--
 pages/rwa_package/shop/fen-shop.vue           |   4 +--
 static/mine/fu.png                            | Bin 0 -> 2100 bytes
 static/mine/zhen.png                          | Bin 0 -> 2288 bytes
 9 files changed, 33 insertions(+), 20 deletions(-)
 create mode 100644 static/mine/fu.png
 create mode 100644 static/mine/zhen.png

diff --git a/components/shop/fen-item.vue b/components/shop/fen-item.vue
index 10a96ac..0ecf978 100644
--- a/components/shop/fen-item.vue
+++ b/components/shop/fen-item.vue
@@ -8,7 +8,7 @@
 				<text class="text-32 text-bold text-zu text-overflow1">{{obj.title}}</text>
 			</view>
 			<view class="right-bottom-view">
-				<text class="text-28 text-zi text-bold">￥{{obj.price}}积分</text>
+				<text class="text-28 text-zi text-bold">￥{{obj.price}}兑换券</text>
 				<MyBtn @ok="onClick" mh="64rpx" text="立即兑换" br="8rpx" bg="linear-gradient( 270deg, #B164FB 0%, #7934F6 100%)" wd="200rpx"></MyBtn>
 			</view>
 		</view>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 6f81765..cb8e6bb 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -99,7 +99,7 @@
 					<view class="min_card_item" @click="jumpIntegral">
 						<!-- <up-image src="/static/home/min_card_jfdh.png" width="60" height="14" bgColor="#f1f6ff00" ></up-image> -->
 						<view class="min_card_item_content">
-							<view class="min_card_item_title">积分兑换</view>
+							<view class="min_card_item_title">信任桥兑换</view>
 							<view class="content_msg">
 								<view>好物随心兑</view>
 								<view class="content_msg_but">
diff --git a/pages/mine_package/mine_purse_log/mine_purse_log.vue b/pages/mine_package/mine_purse_log/mine_purse_log.vue
index 0794068..a911495 100644
--- a/pages/mine_package/mine_purse_log/mine_purse_log.vue
+++ b/pages/mine_package/mine_purse_log/mine_purse_log.vue
@@ -39,7 +39,8 @@
 						v-if="orderList && orderList.length !== 0">
 						<view class="purse_info_left">
 							<!-- <up-image :src="item.type === 1? '/static/mine/purse_sf.png' : '/static/mine/purse_xf.png'" width="40" height="40" bgColor="#f1f6ff00"></up-image> -->
-							<up-image src="/static/mine/purse_sf.png" width="32" height="32" bgColor="#f1f6ff00"></up-image>
+							<up-image :src="item.amount > 0 ? '/static/mine/zhen.png' : '/static/mine/fu.png'" width="32" height="32" bgColor="#f1f6ff00"></up-image>
+							
 							<view class="purse_data_warp">
 								<view class="purse_info_name">{{ getValue(BALANCE_TYPE, item.type) }}</view>
 								<view class="purse_info_value">{{ formatDate(item.ctdate) }}</view>
@@ -137,7 +138,7 @@ export default {
 					key: "totalMallBonus"
 				},
 				{
-					name: "分红资金池剩余",
+					name: "共享资金池剩余",
 					key: "poolBonus"
 				},
 			];
diff --git a/pages/rwa_package/dongjian/finance.vue b/pages/rwa_package/dongjian/finance.vue
index 0c7f063..eb2d0ba 100644
--- a/pages/rwa_package/dongjian/finance.vue
+++ b/pages/rwa_package/dongjian/finance.vue
@@ -85,33 +85,45 @@ export default {
 			myChart:null,
 			myChartTwo:null,
 			data: [
-				{ value: '51', name: '股东' },
-				{ value: '29', name: '推广' },
-				{ value: '10', name: '团队' },
+				{ value: '51', name: '用户股东' },
+				{ value: '10', name: '推广奖励' },
+				{ value: '10', name: '运营团队' },
+				{ value: '10', name: '活动激励' },
+				{ value: '9', name: '投资机构' },
 				{ value: '10', name: '基金会' },
 								
 			],
 			dataSeries:{
 				series:[
 					{
-						"name": "股东",
+						"name": "用户股东",
 						"data": 51,
 						"color":"#FC5E05"
 					}, 
 					{
-						"name": "推广",
-						"data": 29,
+						"name": "推广奖励",
+						"data": 10,
 						"color":"#BC52FD"
 					}, 
 					{
-						"name": "团队",
+						"name": "运营团队",
 						"data": 10,
 						"color":"#FCC139"
 					},
 					{
-						"name": "基金会",
+						"name": "投资机构",
 						"data": 10,
 						"color":"#0474E0"
+					},
+					{
+						"name": "活动激励",
+						"data": 9,
+						"color":"#1890ff"
+					},
+					{
+						"name": "基金会",
+						"data": 10,
+						"color":"#91cb74"
 					}
 				]
 			}, 
@@ -164,17 +176,17 @@ export default {
 					}
 				]
 			}, 
-			dataColor:['#FC5E05', '#BC52FD', '#FCC139', '#0474E0'],
+			dataColor:['#FC5E05', '#BC52FD', '#FCC139', '#0474E0','#1890ff','#91cb74'],
 			dataTwo:[
 				{ value: '25', name: '成本' },
-				{ value: '15', name: '分红' },
+				{ value: '15', name: '消费贡献共享计划' },
 				{ value: '13', name: '销售增值税' },
 				{ value: '12', name: '市场激励' },
 				{ value: '10.5', name: '次年发展资金' },
 				{ value: '10', name: 'RWA市值管理' },
 				{ value: '5', name: '股标护盘' },
 				{ value: '5', name: '交易激励' },
-				{ value: '4.5', name: '年终分红' },
+				{ value: '4.5', name: '年终共享' },
 			],
 			dataTwoColor:['#FF8400','#6136FF', '#19CEB3', '#F1B900', '#AE9BF5'
 			,'#94F7A1','#006EFF','#FF2440','#00A776'],
diff --git a/pages/rwa_package/rwa/rwa.vue b/pages/rwa_package/rwa/rwa.vue
index 6eaba12..744d410 100644
--- a/pages/rwa_package/rwa/rwa.vue
+++ b/pages/rwa_package/rwa/rwa.vue
@@ -5,7 +5,7 @@
 				<view style="margin-top: 20rpx;" @click="leftJump">
 					<up-image src="/static/common/left_b.png" width="18" height="20" bgColor="#f1f6ff00" />
 				</view>
-				<view class="title_">RWA交易</view>
+				<view class="title_">数字积分兑换</view>
 				<view></view>
 			</view>
 			<view class="amount_">
diff --git a/pages/rwa_package/rwa_withdrawal/rwa_withdrawal.vue b/pages/rwa_package/rwa_withdrawal/rwa_withdrawal.vue
index d3b39c4..e72de0d 100644
--- a/pages/rwa_package/rwa_withdrawal/rwa_withdrawal.vue
+++ b/pages/rwa_package/rwa_withdrawal/rwa_withdrawal.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="rwa_withdrawal">
-		<Header leftTitle="行权" left-path-type="navigateTo" left-path="/pages/rwa_package/rwa/rwa" rightTitle="记录"
+		<Header leftTitle="共享计划终止" left-path-type="navigateTo" left-path="/pages/rwa_package/rwa/rwa" rightTitle="记录"
 			rightPath="/pages/rwa_package/rwa_withdrawal_log/rwa_withdrawal_log?back=withdrawal" rightPathType="navigateTo" />
 		<view class="rwa_withdrawal_content">
 			<view class="_content">
@@ -24,7 +24,7 @@
 				</view>
 				<view class="_content_item">
 					<view class="_content_item_title">交易密码<text class="_content_item_setting_pwd"
-							@click="jumpSettingPwd">《股权交割同意书》</text></view>
+							@click="jumpSettingPwd">《共享计划终止协议》</text></view>
 					<up-input placeholder="请输入交易密码" border="surround" v-model="form.password" :customStyle="inputCss"></up-input>
 				</view>
 				<view class="_content_item">
diff --git a/pages/rwa_package/shop/fen-shop.vue b/pages/rwa_package/shop/fen-shop.vue
index eb3e3ad..67fb35c 100644
--- a/pages/rwa_package/shop/fen-shop.vue
+++ b/pages/rwa_package/shop/fen-shop.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="content">
 		<TopSafe></TopSafe>
-		<Header title="积分兑换专区" >
+		<Header title="兑换券专区" >
 			<!-- #ifndef MP-WEIXIN -->
 				<template v-slot:right>
 					<u-icon name="share-fill" @click="onShare" color="#333" size="24"></u-icon>
@@ -17,7 +17,7 @@
 		</view>
 		<view class="mid-panel">
 			<up-image src="/static/common/jingxuan_left.png" width="24" height="8" bgColor="#f1f6ff00"></up-image>
-			<view style="margin:0 12rpx">信任桥积分</view>
+			<view style="margin:0 12rpx">信任桥兑换</view>
 			<up-image src="/static/common/jingxuan_right.png" width="24" height="8" bgColor="#f1f6ff00"></up-image>
 		</view>
 		<view class="setting-view">
diff --git a/static/mine/fu.png b/static/mine/fu.png
new file mode 100644
index 0000000000000000000000000000000000000000..952f5d60f44e4c62c3ff918a24f7262e57cb3c51
GIT binary patch
literal 2100
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

literal 0
HcmV?d00001

diff --git a/static/mine/zhen.png b/static/mine/zhen.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d357562c1d5346700fb3575c1a59d27cd6f3cfd
GIT binary patch
literal 2288
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
KMNUMnLSTYiwo*6%

literal 0
HcmV?d00001