From 66e7d163b715da33e9b77d0a97619933184272d7 Mon Sep 17 00:00:00 2001
From: zhangtianning <573515615@qq.com>
Date: Sat, 24 Feb 2024 21:34:55 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E9=94=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                        | Bin 0 -> 6148 bytes
 pages/.DS_Store                  | Bin 0 -> 6148 bytes
 pages/news3/JoinDistribution.vue |  89 +++++++++++++++++++++++++------
 pages/user/index.vue             |  10 +++-
 pages/wallet/.DS_Store           | Bin 0 -> 6148 bytes
 project.config.json              |  75 +++++++++++++++++---------
 static/.DS_Store                 | Bin 0 -> 10244 bytes
 static/order/.DS_Store           | Bin 0 -> 6148 bytes
 8 files changed, 132 insertions(+), 42 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 pages/.DS_Store
 create mode 100644 pages/wallet/.DS_Store
 create mode 100644 static/.DS_Store
 create mode 100644 static/order/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..61bd0fe39976356c35b482ad047caf4f77fc71e2
GIT binary patch
literal 6148
zcmeHK%}xR_5T5d9!5BH1$gvl19N75B#bkqc@Mf|`4{Bgn2yBA8gk2<xn0*a>BcH(6
zai%Q>MB~jE=p-}WblT}=zNGCA0I=GyWdRfcfTI#-3TVC&nkQY5l#XN&ncO4tMp57E
zh2Fwi6EF-I2L2xdbau1Q2NycfhS~G`=Jk7i6jv(mES1h=b8DOzcwwV(<8;H36T9&+
zs=0$J8lAau*VF!a81_DW*SqlBqegM-I1FOf584Bn?6=yu<oePNTH&Y`4ue)C_i@w&
z=XsuQ6ief=wYOUq`-hXV7+aMCt1PNkbu!8G?H%jrw0ZaNIDVQuzbIB2UO`eeHBR9b
zotYBvok7qGgAPV1BL@-0SbhvX+|FEIOI7|{kzWXy(qwSe7|;iXudiC+re4E<Vc=H=
z=zb8Wgto>+p}acK$QA&Rej}uyPrU@?2#vPJL?O<gFqMj^QkiZsm`caE(CciCi9(eQ
zOgA4)f0^kHg~_ku{z5JXW-Bz-Fkl#%XCSSHMSA~Fe(wM0lg!94U>H~`23V%<)N5Fh
zep?rcqqkO|Hc?4vU7}E?pwZ8<bm%EAp-RCyK@Os=F;R#S6!Rk>X)wkx@TUxX08&Mj
A4*&oF

literal 0
HcmV?d00001

diff --git a/pages/.DS_Store b/pages/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..85d9a35fe7d5cffdc6869905772c94d66a36648a
GIT binary patch
literal 6148
zcmeHK%TB^T6ul!42aJ)0i7aR1js=Y`HYN??!ktNtF4RDqHqxZFgchqJroW+o<QMom
z-g!WHs7qsDF1d52cjiuWPC7GO03gkQYXDRLfTDBEm$CWA_&E0kTT_uDA`xpmI%(W<
zg2-8zs{>jAt-$|NfbZP`_z;2%9!&4w52qLSaZ;~;lC@mEP+X_9Ov{_)TdNzTR$?cE
zxM}yV`O~?bbRE^dh@xQ9x1CGhOWT$0lPFAVKlJ({*>^pha&zT}Zj?5oLFmR}9ZL>S
zTB4<Pr8*oM`+GHZa5Sp1p;13HYOG;2Mxzql*)@*OI`>b{!<W(Pn^cwH5hQF&;TYbr
zGez;i>W4uT-eHty6p*?HDa2q*9bQXDenN4Md=ZJ;5a7>)WLfFYkem}>{Ee(6strRo
zR+7CYtrgG;{H6du9~e4EQ(-1i939w*5&$ueVPV+kwFJ*$3QdKXL>xgQG8Iv#5>;Xl
znT~O$=9vmJi839CDn5vMGf@=^5pT!!nV1g5l&D*+fL35uft-A-@caMt=lXv(Nk3@?
zv;s?|0LizkRud_yyLEvaziSzK2b~+Amq`>U*r@ARbof<VMHhx+jCT-Cg_%T*py@vX
MLI&Mv1^!flFGIiA-T(jq

literal 0
HcmV?d00001

diff --git a/pages/news3/JoinDistribution.vue b/pages/news3/JoinDistribution.vue
index d4dd0c0..0d549aa 100644
--- a/pages/news3/JoinDistribution.vue
+++ b/pages/news3/JoinDistribution.vue
@@ -1,8 +1,9 @@
 <template>
 	<view>
-		<view style="width:100%;position: fixed;top:0;z-index:99">
+		<view class="status-box"></view>
+		<view style="width:100%;position: fixed;top:var(--status-bar-height);z-index:99">
 			 <view class="navBarContent">
-					<u-icon name="arrow-left" style="position: absolute;top:50%;left:40upx;transform: translateY(-50%);" color="#000" size="24"></u-icon>
+					<u-icon name="arrow-left" @click="goBack()" style="position: absolute;top:50%;left:50rpx;transform: translateY(-50%);" color="#000" size="24"></u-icon>
 					<text>加入分销</text>
 			 </view>
 			
@@ -11,17 +12,17 @@
 		<view class="userInfo">
 			<image :src="$picUrl+'/static/news3/join.png'" mode="widthFix"></image>
 			<view class="userContent">
-				<image src="/static/news/avater.png" mode="aspectFill" class="avatar"></image>
+				<image :src="user.avatar_url" mode="aspectFill" class="avatar"></image>
 				<view class="user">
 					<view class="userTop">
-						<text class="name">Deioio</text>
+						<text class="name">{{ user.nick_name }}</text>
 						<view class="flag">
 							分销商
 						</view>
 					</view>
 					<view class="userBottom">
-						<text>加入时间2024.01.21</text>
-						<view class="tixian">
+						<text>加入时间：{{dealer.update_time}}</text>
+						<view class="tixian" @click="$navTo('pages/dealer/withdraw/apply')">
 							提现
 						</view>
 					</view>
@@ -32,13 +33,15 @@
 		<view class="yongjinContent">
 			<view class="item">
 				<text class="num">
-					0.00
+					<!-- {{ setting.words.index.words.money.value }} -->
+					{{ dealer.money }}
 				</text>
 				<text class="text">已提现佣金</text>
 			</view>
 			<view class="item">
 				<text class="num">
-					0
+					<!-- {{ setting.words.index.words.freeze_money.value }} -->
+					{{ dealer.freeze_money }}
 				</text>
 				<text class="text">未结算佣金</text>
 			</view>
@@ -48,19 +51,19 @@
 				<image :src="$picUrl+'/static/news3/fx1.png'" mode="widthFix"></image>
 				<text>分销佣金</text>
 			</view>
-			<view class="gridItem">
+			<view class="gridItem" @click="$navTo('pages/dealer/order')">
 				<image :src="$picUrl+'/static/news3/fx2.png'" mode="widthFix"></image>
 				<text>分销订单</text>
 			</view>
-			<view class="gridItem">
+			<view class="gridItem" @click="$navTo('pages/dealer/withdraw/list')">
 				<image :src="$picUrl+'/static/news3/fx3.png'" mode="widthFix"></image>
 				<text>提现明细</text>
 			</view>
-			<view class="gridItem">
+			<view class="gridItem" @click="$navTo('pages/dealer/team')">
 				<image :src="$picUrl+'/static/news3/fx4.png'" mode="widthFix"></image>
 				<text>我的团队</text>
 			</view>
-			<view class="gridItem">
+			<view class="gridItem" @click="$navTo('pages/dealer/poster')">
 				<image :src="$picUrl+'/static/news3/fx5.png'" mode="widthFix"></image>
 				<text>推广二维码</text>
 			</view>
@@ -70,20 +73,71 @@
 </template>
 
 <script>
+	import AvatarImage from '@/components/avatar-image'
+	import * as Api from '@/api/dealer'
 	export default {
 		data() {
 			return {
-				
+				// 正在加载
+				isLoading: true,
+				// 当前用户信息
+				user: undefined,
+				// 当前是否为分销商
+				isDealer: false,
+				// 当前分销商信息
+				dealer: undefined,
+				// 推荐人昵称
+				refereeName: undefined,
+				// 分销设置
+				setting: {
+				  background: undefined,
+				  words: undefined
+				}
 			};
 		},
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		onLoad(options) {
+		  this.getCenter()
+		},
 		methods:{
 			/**
 			 * 售后点击
 			 */
+			goBack(){
+				uni.navigateBack({ // 调用uni-app提供的跳转API
+					delta: 1 // 表示返回上一个页面，若为0则表示不进行任何操作
+				});
+			},
+			// 获取分销商中心数据
+			getCenter() {
+			  const app = this
+			  app.isLoading = true
+			  Api.center()
+			    .then(result => {
+			      // api数据赋值
+			      const data = result.data
+			      app.isDealer = data.isDealer
+			      app.user = data.user
+			      app.dealer = data.dealer
+			      app.refereeName = data.refereeName
+			      app.setting = data.setting
+			      // 设置当前页面标题
+			      app.setPageTitle()
+			      app.isLoading = false
+			    })
+			},
 			onApplyAftersales(){
 				uni.navigateTo({
-					url: '/pages/AfterSaleType/AfterSaleType',
+					url: '/pages/dealer/poster',
 				})
+			},
+			// 设置当前页面标题
+			setPageTitle() {
+			  uni.setNavigationBarTitle({
+			    title: this.setting.words.index.title.value
+			  })
 			}
 		}
 	}
@@ -96,13 +150,16 @@ page{
 	padding-bottom: 140upx;
 	padding-top:200upx;
 }
+.status-box{
+	height: var(--status-bar-height);
+}
 .bgImg{
 	width:100%;
 	height:auto;
 	position:absolute;
 	top:0;
 	left:0;
-	z-index:1;
+	z-index:-1;
 }
 
 .navBarContent{
@@ -121,7 +178,7 @@ page{
 .userInfo{
 	position: relative;
 	z-index:3;
-	margin:0 30upx;
+	margin:130upx 30upx 0;
 	image{
 		width:100%;
 		height:auto;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index a7c46b2..600959f 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -400,12 +400,20 @@
 							邀请朋友
 						</view>
 					</view>
-					<view class="serveIcon" @click="goJump('/pages/invite/index')">
+					<!-- <view class="serveIcon" @click="goJump('/pages/invite/index')">
 						<image :src="$picUrl+'/static/user/invites.png'" class="icons"></image>
 						<view class="serveInfo">
 							<text v-if="userInfo.user_type >=30">邀请分销</text>
 							<text v-else >加入分销</text>
 						</view>
+					</view> -->
+					<view class="serveIcon" @click="goJump('/pages/news3/JoinDistribution')">
+					<!-- <view class="serveIcon" @click="goJump('/pages/dealer/index')"> -->
+						<image :src="$picUrl+'/static/user/invites.png'" class="icons"></image>
+						<view class="serveInfo">
+							<!-- <text v-if="userInfo.user_type >=30">邀请分销</text> -->
+							<text>加入分销</text>
+						</view>
 					</view>
 					
 					<view class="serveIcon" @click="goJump('/pages/news1/help',1)">
diff --git a/pages/wallet/.DS_Store b/pages/wallet/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..11abb0dfa3ff7b17f2eb91140ea1a7c20b6cb5e8
GIT binary patch
literal 6148
zcmeHK%}&BV5S|s31!Lr3BFDXW<3Qsd7n26@;LW5)4{D&52Ab5Clp;~Y^fmO2d;(v`
zncc+*=)sFIWG9*ZW_NbBnJ?Md4gj#muwwy~0f3_t=1VwyBjhJtkQKd>M`ZGh2yVgm
zMuWZ=F6=f7h5^ICe`A2|ZUH=SAw>Ohe`60lZ(ctP25GJK&Q@~y)wKfWC0^Pn-8j8?
z<fLvo95meIie_hS+Vix19>?LQ?Rpo1KWde?j^ikGgUC;0aM1B_%k^atb>dMY9!8yk
zJjYQE&WpU*Dp$s1Yj3wI_75jjF}7+4R#nuk`eah%+dJ0LY5VTsar`uSeo?$KEJIQ@
zHBR9bjkz@Mog@n5sEZzo;*fxk<*SD@B+#9fvE`#-A<;P^rj!|6b_Voi;p@wusL9VT
zU>Nu{15_UbDxs}0Qz%OZ4zdM6q~8cBXj3miF+!uQF;j>h6sAHERVdRf22<g<F7!TI
zW2R7r1Jlh1(_dz~Lt*mkc)pO^f!PYpXc#aI%rcNu(=xsPCqMW9vq5HN7%&Vh6$32a
zbeauJNx!WN$<bRYP}`^^v@cUALvYZ~u{7u@uAoXmpCAL#)|e^86%_L$AZajzVc<_0
F_yC`tm*)Tg

literal 0
HcmV?d00001

diff --git a/project.config.json b/project.config.json
index 0f6f023..0897204 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,28 +1,53 @@
 {
-    "appid": "wx68d198de972a9e9d",
-    "compileType": "miniprogram",
-    "libVersion": "3.3.3",
-    "packOptions": {
-        "ignore": [],
-        "include": []
+  "appid": "wxdf1583a43c9a5725",
+  "compileType": "miniprogram",
+  "libVersion": "3.3.3",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "urlCheck": true,
+    "es6": true,
+    "enhance": true,
+    "postcss": true,
+    "preloadBackgroundData": false,
+    "minified": true,
+    "newFeature": false,
+    "coverView": true,
+    "nodeModules": false,
+    "autoAudits": false,
+    "showShadowRootInWxmlPanel": true,
+    "scopeDataCheck": false,
+    "uglifyFileName": false,
+    "checkInvalidKey": true,
+    "checkSiteMap": true,
+    "uploadWithSourceMap": true,
+    "compileHotReLoad": false,
+    "lazyloadPlaceholderEnable": false,
+    "useMultiFrameRuntime": true,
+    "useApiHook": true,
+    "useApiHostProcess": true,
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
     },
-    "setting": {
-        "coverView": true,
-        "es6": true,
-        "postcss": true,
-        "minified": true,
-        "enhance": true,
-        "showShadowRootInWxmlPanel": true,
-        "packNpmRelationList": [],
-        "babelSetting": {
-            "ignore": [],
-            "disablePlugins": [],
-            "outputPath": ""
-        }
-    },
-    "condition": {},
-    "editorSetting": {
-        "tabIndent": "auto",
-        "tabSize": 4
-    }
+    "useIsolateContext": false,
+    "userConfirmedBundleSwitch": false,
+    "packNpmManually": false,
+    "packNpmRelationList": [],
+    "minifyWXSS": true,
+    "disableUseStrict": false,
+    "minifyWXML": true,
+    "showES6CompileOption": false,
+    "useCompilerPlugins": false,
+    "ignoreUploadUnusedFiles": true
+  },
+  "editorSetting": {
+    "tabIndent": "auto",
+    "tabSize": 4
+  },
+  "projectname": "yanzong_qianduan",
+  "condition": {}
 }
\ No newline at end of file
diff --git a/static/.DS_Store b/static/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..0e0d261518901f5c012a351d121d6b861044e222
GIT binary patch
literal 10244
zcmeI1%Wl&^6o${VY2pMBSs-9J8zdG%vQ;kKAVr}p*dYbM0#Iw?sIf41WIK&$8kE<7
zH{uC+9saox#go7WgwoMWG;?gv96SFf&)Dafh}d8n2Sl8RJXB%3*U@Y#qF>aFvZs&S
zhGp<4novqpDx+CB*%<8(I0BA<Bj5-)0*=5g5Wq8A6z`g{u5|<)0Y_j(K&%fORoK3^
zOJ(KKfkuV^unioR1>1-Nqz~7&ukBJ<>56lz=z(chrb7&-+|kd)aM-@KOJ$WiG38E7
zUzzC$g~_YKkIUi2`pUZ25pV=H35eL;qY#n%gdVKN?@^jZ==&Z`(xj|>{|DRKZyYpR
zp4ag@H#+Z!<9s%(!fIL$!s4yidl^>aNN>N&^K`WxMz536?4*0^S)Ns4l8p-KoWvsx
zdG{vC;(Rv9r&(Oe^9)so=e51|N%!u29y~nk@kdV<Jw6Zo$3c%D1xJfT+q-iwc>3b>
z)8~u%<>Jd%rH$$Jfo>XFziktGJ}j~{&(6>%{5li?#RvLGXH-y*R7OUzNM`I548O+@
z{lAB?RjdJ|1sG!>$?zLdYAXsurU9WzF~nEEkl2f$Cei@Vg7A#aF(DG%4<mc;f|^VN
z!U5zL@=hph1+XU35Z|N{Qy>HYtOvHruZc7Ov?KuWWWX9=?<!!(G$1tPA{fbsq_vZv
zCei@V5Fa-%5q3}fKYBr02{eQ^X@=R48(%yK?VbN?A`Jk>%cR?N1RMcJ;A#`tSAU<2
z{QvXcfB(PQBHh1t1RQ}s5@3zv;qd@Ne&x>0(IVH*QBP4t5#yH1N*6RT9S<wh@z@dR
z`1`10tS_u6*zRk)R2D~2{{P2-ZP`I1&0)L&t_8=oz5uUDG{o0JV_W6dL>d5$z}Nx=
FKLJIX$Z-Gw

literal 0
HcmV?d00001

diff --git a/static/order/.DS_Store b/static/order/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..c75603dfcf5d134f2f8ea195b8445dee54bf6dfe
GIT binary patch
literal 6148
zcmeHK!AiqG5Z!HS-BiRL1bf_zw;mD{=|u>&9=r(=J*cz^DK=1((xeuxk^F}Kkze5N
zIJ3Jgl<L8Yh@FAiH#<AC%f5u2UB(!1PeO;WI%7<LB9<&@z7QNoU6GRUAaXUwgr&hW
z9R<TAScxXbUt|EkU6rLQV?OBe_j?aU!zj&c`-7Ltm5u7A5H(TTuHAZrWa?#pHc8w5
z_!@iXel`e<eUT)?h3yBIQGeR4@17)a=0|aVtdgU!4<R>KQ5+`Ib~1^>RL$e*0U<15
zb?c4U%sI51^1#lUa^~1aPE)p=R-Rj8Z{ImS>)k&-&7Sj@SIsPkpHRt;!8yEvv9!qt
zZyXPk_zwK@oOvuEF+dCu18cy5Ir_xb8tj#}NDL4IKVtyT2MLPk8Z0!bqXQbeKH_)<
z5d~~~OCU;vuE9bhjDT>R3aC@Ld17##4t{CkT!V#1ozA#g8Rju7bMr#sYIX2S70$S;
zky>Ja7+7YYth;rr|EJ%-|Cf`fM+^`H|B3-#>3E$sY{}HtmCa$Tm7qOP6pSl0E>gfy
hr5Iwd6gNPXfM22k=o&0Ef(L{y0*VG|h=E^a;1e0?Qm_C3

literal 0
HcmV?d00001


From 8737255adcadbda582b9c8628c74a49abdba008f Mon Sep 17 00:00:00 2001
From: zhangtianning <573515615@qq.com>
Date: Sat, 24 Feb 2024 22:07:25 +0800
Subject: [PATCH 2/2] appid

---
 project.config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project.config.json b/project.config.json
index 0897204..435aa7e 100644
--- a/project.config.json
+++ b/project.config.json
@@ -1,5 +1,5 @@
 {
-  "appid": "wxdf1583a43c9a5725",
+  "appid": "wx68d198de972a9e9d",
   "compileType": "miniprogram",
   "libVersion": "3.3.3",
   "packOptions": {