From 92b8f3a51a8c8a41f893cc2efb8d61aa73d3b116 Mon Sep 17 00:00:00 2001
From: chenkainan <chenkainan163@163.com>
Date: Tue, 13 May 2025 16:38:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json                       |   9 +-
 package.json                            |   1 +
 pages.json                              |  24 ++
 pages/index/index.vue                   |  14 +-
 pages/login/login.vue                   | 217 +++++++++++++
 pages/user/user.vue                     |   6 +-
 static/images/home.png                  | Bin 6886 -> 0 bytes
 static/images/mine.png                  | Bin 6168 -> 0 bytes
 static/images/selectHome.png            | Bin 5473 -> 0 bytes
 static/images/selectMine.png            | Bin 10344 -> 0 bytes
 static/js/mmmm-image-tools/index.js     | 196 ++++++++++++
 static/js/mmmm-image-tools/package.json |  11 +
 static/js/request.js                    |   4 +-
 subPackages/shiguang/index.vue          | 102 ++++++
 subPackages/shiguang/shiguang.vue       |  19 --
 subPackages/user/changeNickname.vue     |  89 ++++++
 subPackages/user/profile.vue            | 407 ++++++++++++++++++++++++
 17 files changed, 1073 insertions(+), 26 deletions(-)
 create mode 100644 pages/login/login.vue
 delete mode 100644 static/images/home.png
 delete mode 100644 static/images/mine.png
 delete mode 100644 static/images/selectHome.png
 delete mode 100644 static/images/selectMine.png
 create mode 100644 static/js/mmmm-image-tools/index.js
 create mode 100644 static/js/mmmm-image-tools/package.json
 create mode 100644 subPackages/shiguang/index.vue
 delete mode 100644 subPackages/shiguang/shiguang.vue
 create mode 100644 subPackages/user/changeNickname.vue
 create mode 100644 subPackages/user/profile.vue

diff --git a/package-lock.json b/package-lock.json
index 922878f..50708b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,7 +1,14 @@
 {
-  "requires": true,
+  "name": "cgc_wechat",
+  "version": "1.0.0",
   "lockfileVersion": 1,
+  "requires": true,
   "dependencies": {
+    "moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmmirror.com/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how=="
+    },
     "ydui-district": {
       "version": "1.1.0",
       "resolved": "https://registry.npmmirror.com/ydui-district/-/ydui-district-1.1.0.tgz",
diff --git a/package.json b/package.json
index 2f2856a..8d1b0c0 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
   "description": "",
   "main": "main.js",
   "dependencies": {
+    "moment": "^2.30.1",
     "ydui-district": "^1.1.0"
   },
   "devDependencies": {},
diff --git a/pages.json b/pages.json
index 3b54199..c6f9c50 100644
--- a/pages.json
+++ b/pages.json
@@ -12,6 +12,12 @@
 				"navigationBarTitleText": "我的",
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "大美非遗"
+			}
 		}
 	],
 	"subPackages": [{
@@ -90,6 +96,24 @@
 				"style": {
 					"navigationBarTitleText": "确认订单"
 				}
+			},
+			{
+				"path": "shiguang/index",
+				"style": {
+					"navigationBarTitleText": "非遗拾光"
+				}
+			},
+			{
+				"path": "user/profile",
+				"style": {
+					"navigationBarTitleText": "个人信息"
+				}
+			},
+			{
+			    "path" : "user/changeNickname",
+			    "style" : {
+			        "navigationBarTitleText" : "修改昵称"
+			    }
 			}
 		]
 	}],
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 9fe3e7b..e54d71f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -47,7 +47,7 @@
 		<!-- 非遗时光 -->
 		<view class="title-box flex-between">
 			<image src="https://static.ticket.sz-trip.com/cgc/images/index/title2.png" mode=""></image>
-			<image src="https://static.ticket.sz-trip.com/cgc/images/index/more.png" mode=""></image>
+			<image src="https://static.ticket.sz-trip.com/cgc/images/index/more.png" mode="" @click="gotoPath('/subPackages/shiguang/index')"></image>
 		</view>
 		<view class="time-box" style="background-image: url('https://static.ticket.sz-trip.com/uploads/20230920/7cdb05709d09cc2c86ea5671bd657c85.jpg')">
 			<image src="https://static.ticket.sz-trip.com/cgc/images/index/play.png" class="play"></image>
@@ -142,6 +142,7 @@
 				this.getLocation()
 			}
 			
+			this.topBanner()
 			this.changeType(0)
 		},
 		onReachBottom() {
@@ -150,6 +151,17 @@
 			}, 1000);
 		},
 		methods: {
+			getBanner() {
+				// 大轮播
+				// this.Post({
+				// 	type_id: 3,
+				// 	position: 6,
+				// }, '/api/adv/getAdv').then(res => {
+				// 	if (res.data) {
+				// 		// this.topBanner = res.data;
+				// 	}
+				// });
+			},
 			// 瀑布流
 			getColumnItems(columnIndex) {
 				const columnItems = [];
diff --git a/pages/login/login.vue b/pages/login/login.vue
new file mode 100644
index 0000000..1de3eb8
--- /dev/null
+++ b/pages/login/login.vue
@@ -0,0 +1,217 @@
+<template>
+    <div style="padding-top: 88rpx;">
+        <div class="login-tip">大美非遗 申请获得</div>
+        <div class="login-tip2">以下权限</div>
+        <div class="login-tip-box">
+            <text>获得你的公开信息（昵称、头像、地区及性别）</text>
+        </div>
+        <div class="btn-box">
+            <button bindtap="cancel" type="default" @click="redirectIndex">取消</button>
+            <button type="primary" @click="getUserInfo">同意</button>
+        </div>
+        <div class="flex-center article-box">
+            <radio-group @change="toggleAgreement">
+                <radio value="1" :checked="isAgreed" style="transform:scale(0.7)"></radio>
+            </radio-group>
+            <div>同意<text @click="gotoInfo">《用户服务协议》、《隐私政策》</text></div>
+        </div>
+        <uni-popup ref="popup" type="bottom" background-color="#fff">
+            <button type="default" open-type="getPhoneNumber" @getphonenumber="handlePhoneNumber" style="width: 100%;height: 12vh;line-height: 12vh;">点击授权手机号</button>
+        </uni-popup>
+    </div>
+</template>
+
+<script>
+export default {
+    name: "login",
+    data() {
+        return {
+            isAgreed: false,
+        };
+    },
+    onLoad(options) {
+        // 只需授权手机号
+        if (options.needAuth === '1') {
+            setTimeout(() => {
+                this.$refs.popup.open('bottom');
+            }, 400);
+        }
+    },
+    methods: {
+        // 处理手机号授权
+        handlePhoneNumber(e) {
+            if (e.detail.errMsg === "getPhoneNumber:ok") { // 成功
+                this.$refs.popup.close();
+                this.Post({
+                    code: e.detail.code,
+                    encryptedData: e.detail.encryptedData,
+                    iv: e.detail.iv,
+                    token: uni.getStorageSync('token1')
+                }, '/api/mini_program/bindPhoneNumber')
+               .then(res => {
+                    this.$store.commit('changeUserInfo', res.data.userinfo);
+                    this.navigateBasedOnPath();
+                })
+               .catch(error => {
+                    console.error('绑定手机号失败:', error);
+                    uni.showToast({
+                        title: '绑定手机号失败，请稍后重试',
+                        icon: 'none'
+                    });
+                });
+            } else {
+                console.error('获取手机号失败:', e.detail.errMsg);
+                uni.showToast({
+                    title: '获取手机号失败，请稍后重试',
+                    icon: 'none'
+                });
+            }
+        },
+        // 跳转到协议页面
+        gotoInfo() {
+            uni.navigateTo({
+                url: '/subPackages/user/privacy'
+            });
+        },
+        // 切换协议同意状态
+        toggleAgreement() {
+            this.isAgreed = !this.isAgreed;
+        },
+        // 重定向到首页
+        redirectIndex() {
+            uni.switchTab({
+                url: '/pages/index/index',
+            });
+        },
+        // 获取用户信息
+        getUserInfo() {
+            if (!this.isAgreed) {
+                uni.showToast({
+                    title: '请先勾选同意《用户服务协议》、《隐私政策》',
+                    icon: 'none'
+                });
+                return;
+            }
+            uni.login({
+                provider: 'weixin',
+                success: (loginRes) => {
+                    uni.getUserInfo({
+                        withCredentials: true,
+                        success: (res) => {
+                            this.Post({
+                                code: loginRes.code,
+                                userInfo: res.userInfo,
+                                encryptedData: res.encryptedData,
+                                iv: res.iv,
+                                wechat_qrcode: uni.getStorageSync('wechat_qrcode') || ''
+                            }, '/api/mini_program/login')
+                           .then(resTwo => {
+                                this.$store.commit('changeUserInfo', resTwo.data.userinfo);
+                                if (resTwo.data.userinfo.mobile) {
+                                    this.navigateBasedOnPath();
+                                } else {
+                                    uni.setStorageSync('token1', resTwo.data.userinfo.token);
+                                    this.$refs.popup.open('bottom');
+                                }
+                            })
+                           .catch(error => {
+                                console.error('登录失败:', error);
+                                uni.showToast({
+                                    title: '登录失败，请稍后重试',
+                                    icon: 'none'
+                                });
+                            });
+                        },
+                        fail: (err) => {
+                            console.error('获取用户信息失败:', err);
+                            uni.showToast({
+                                title: '获取用户信息失败，请稍后重试',
+                                icon: 'none'
+                            });
+                        }
+                    });
+                },
+                fail: (err) => {
+                    console.error('微信登录失败:', err);
+                    uni.showToast({
+                        title: '微信登录失败，请稍后重试',
+                        icon: 'none'
+                    });
+                }
+            });
+        },
+        // 根据路径进行导航
+        navigateBasedOnPath() {
+            if (this.$store.state.user.toPath.includes('user/user')) {
+                uni.switchTab({
+                    url: this.$store.state.user.toPath
+                });
+            } else {
+                uni.navigateBack({});
+            }
+        }
+    },
+};
+</script>
+
+<style>
+.login-tip {
+    font-size: 28rpx;
+    margin: 0 60rpx;
+    margin-top: 40rpx;
+}
+
+.login-tip2 {
+    font-size: 44rpx;
+    margin: 0rpx 60rpx;
+    margin-top: 20rpx;
+    font-weight: 400;
+}
+
+.login-tip-box {
+    display: flex;
+    align-items: flex-start;
+    margin: 0 60rpx;
+    font-size: 28rpx;
+    margin-top: 40rpx;
+    line-height: 40rpx;
+}
+
+.login-tip-box .icon-gou1 {
+    line-height: 80rpx;
+    margin-top: -20rpx;
+    margin-right: 30rpx;
+    color: #666;
+}
+
+.btn-box {
+    display: flex;
+    position: absolute;
+    bottom: 100rpx;
+    left: 0;
+    right: 0;
+}
+
+.btn-box button {
+    width: 400rpx;
+}
+
+.article-box {
+    position: absolute;
+    left: 0;
+    right: 0;
+    justify-content: center;
+    font-size: 24rpx;
+    color: #1aad19;
+    bottom: 40rpx;
+}
+
+.article-box .iconfont {
+    margin-right: 10rpx;
+    font-size: 26rpx;
+}
+
+.article-box text {
+    border-bottom: 1px solid;
+}
+</style>
\ No newline at end of file
diff --git a/pages/user/user.vue b/pages/user/user.vue
index af8b3a5..16a3054 100644
--- a/pages/user/user.vue
+++ b/pages/user/user.vue
@@ -2,7 +2,7 @@
 	<view class="bg">
 		<view class="title">我的</view>
 
-		<view class="topBox">
+		<view class="topBox" @click="gotoProfile">
 			<view class="avatar-box flex-center">
 				<image :src="showImg(userInfo.avatar)" mode="aspectFill" class="headImg" v-if="userInfo.avatar"></image>
 				<image src="https://changshu.js-dyyj.com/uploads/20250326/516242619f0772bee371a60684618c01.png" mode="aspectFill"
@@ -10,7 +10,7 @@
 			</view>
 			<view class="username" v-if="userInfo.nickname">{{userInfo.nickname}}</view>
 			<view class="username" v-else>请登录/注册 ></view>
-			<view class="personalCenter flex-center" v-if="userInfo.nickname" @click="gotoProfile">
+			<view class="personalCenter flex-center" v-if="userInfo.nickname">
 				个人中心
 			</view>
 		</view>
@@ -84,7 +84,7 @@
 </template>
 
 <script>
-	// import moment from "moment";
+	import moment from "moment";
 	export default {
 		data() {
 			return {
diff --git a/static/images/home.png b/static/images/home.png
deleted file mode 100644
index adfa5beb1d19f737c876f37ad92a6980803ce3cd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6886
zcma)BWn5F={~tLdH$p;k(m5DPD&c6Pkx&K_qq|c=V4#%bXpoQ=5R@Ju>FAP1a)6Y8
zNQl3EpZ_2H@9TB%d2r5y^Evl(-*w~kbkwNGS;zqZ0F{P1+yFnm{qH6t#XoB?N{{ga
zfwzI0GN5*pbr%3&Db#=~83iB?Ebe$%%mm*4^IqkB{>~NKDXVG~<zl9*+aQ94WR!rE
zhX^%NK@CkKk|W#)+#`}xelfe+IlPXOE-*=rR7J9{addZWY#Pl$i^>@V+$AV$o4a&2
ztWi{h4JDtKPA|gt0`u+f@2*^w@O5mhFeeP09zMFr{TFhv`tKj~lCi0&i6kZ_CL4vL
z1;@n?qOq*t6fWcn4`i|T$8oc*L?Dzssaz0k`(o&gWh3(G$no(pZRxZo#9S5rCJyHV
zspKjKfO+C@RFDNV_!!K)3w8E&<77uL-HqW6lSf)gN=mf({+9W^a~w_;A{&e9Nd>$#
zg|}t}62TOhC`m1MaX6+5$u%QxtKtb<pk~EB3Ks>Z=P5Rakhi#Wg1~@ZYT$V#xIZN|
zwcBE&J<S(TSQV;j9YFV{udu2;2Zb@qMz@%MT?~W4hW@RFgrgQzHjAvF-@}%D=MK6K
zniqX|ILizG@2%@i;m#fE0=`19E?syAZA$tMFOj4pWT7bSN+4}r6Re*OU_#(4JRck!
zWWe5NcrZX@dsQq?;@^vdRp9$<6Tbmq-;6c}<Js`IK5HegOcHvL)$JGoY0X95Wtor=
z;BQ}vQi9tuf**-O_M2w&IyySs165vBESofkJG#2oXqFo6$hDGUys8?};}-PbKr@&$
z@GEsSuSvZf=9~qlpbB@Ui-QkLmTCd#YM$F?vT!bK??(r?+0ZW^#WYqUky+pV$mO6Q
z?0imgW9KOKp7{`*%;{U*{sYhO4Jhm)elW&Ju&KGO?x=9_N$Kz4c>?6ta5{y`ChcN#
zT`a%#Hjk=H09eUg{B#P^fJW2MO?ZJLRE%}uN@6+Ruxjv4X2^m%{5ifG@|T;O=fGlP
z89k5eh?qRm_4tia)wyf+G?yWeOz~3z_NPdXST0jJ%?e9tMdzcvJ=uUEp3K}-ZC(Wt
zh!hC?^`1Ni<m|@S0|df1{jrqMUtXQ8_qk_8p#&)~81LXe$3MIyyVnL(Hf519{OBW3
z@A}JFl}!`#eITd7-rgRyjW>aE&AC8^orNf*fV0>bOG&*=%5+0L-cB|39DWE+5qb3J
z(RGKsDfS{w-U>v+!p3INjh&NWH#Jpe+_I8*q8kx?%7l5R&D#bfC5_Qp`sg4TL=Lm;
z!@fE+eUi!bcC9boKr>}FC>hnvLa`UOva+)Ch8g7MEo6pS3OOB_eIwTS1rQWNM}L!S
zvk;bsI({YQ9BJaG2M6gbC2RA(s%Tn~f<ggO|Gt=nhKBOf#wiwD0>B*u!~&0YA9(yy
zS^`gmX4utmu(Ri%S-9mq%;^f|I&>Lz@A0oQtzQ@Z)==v+NdrhTCKax|ivB@aC-)=5
z6?>zFTzM!j9}*z((UzCMEkm6f(_KrThz>-noxJ8sq@AG9d(9?xx)310GK9^yeJ<{*
zs6ohk_l*c&v5?B9ITF!}ZF0Mp$)o%mHE5V&=SoRTc)-TS_Ay4@(%0Ab$K~mc<ywF*
z7a=$)o_T8V4MU7a&o=-SOu=Q*Zy-TxC7>{EU9Xgw$<5iBf`*2spsMLM3#C}#aJ+5`
z(~;&cx>nf?1Gnf3%!rdnbvijZ${52J;G2d>cD`WAj&9?ar>uMS=KG1CSHprWE8rbk
zB+#XW1r`n7)J$f5k2~PJoG2KzRUGWpJu6TPk`mBaS4RVZ98t(luXF_Olp9n~q#JM$
z42YL~uCo6QU@8pkJ2|O_d49MR07xJCZeCeU5RsO-3Z~1-F;Vt>iY9A~MCsTdw|HYv
zWWxvh<A$7s1{KqHzcnE8w-f5Kv$M@nxUu5_tX_|WAulJyGfurLmF0@efalZfavyuF
zAQJO7uJFEEqOey86H4+`Kers0@8q|37zF27!f9k;;{WOM=Zz{+^%YGUoBIZQD`Qyo
zVdW*K#LPgJW%66}Q%Hj-6Q!SzpI^@>u|aw7Eq=b0qv&J9P&LF@R3lSQ*J@S+NXeKT
z7`5X^(_Rhnn#196T0}%dASIGUP3?u9U1~-m;0*w_iotTxyZ~wSgjlL|LMIhm7jKR0
zy|RmmwL?SyYW(o{5{>?WYU`hPB>M2@;v1ew?SGFy1|q{gR8>`dyFXaA)od#47c+ZB
zJ77auXgQ4C*}^!kZSM0HU*{RU<x^Et^A8liD7RZ@2MP#cnCw|M71kAx>t2jt%L8vT
zn^20IiY*;;%?Iarw1U30zp1RNtD`23Vl>N$&bq72U?0Sw|G@~9@>jE>t!ef`{4_s6
zK5@-XAN8S_5Zhq)O@|^{89)vh5kld(#gL5?L?9jnFoT_p*zcLKF`I+Cd+e&sLs2&e
zhb%fuQvC+PR}<xIAgKWTm=W8eS8UeX2j=?)K*ESbHaS1m?1X6gQtBwNhRVu4>wzLa
zh8rP-2vs9fIN=Gibnl@qH?7?D_4TSS>AE%bgu|J3>2&bZY6|w<MlaM8E^nIR^Opf-
z{)bB~ZOK7djM*a(WA$rlYEISE)G`H1-5|v|ab(m`Q)M?sdQ<)ekX-VmKNFCNFkZ!%
z`RKUGe4j@AbO!EIIq<-m4fUj`dMgZN{>QCsUL={W2FU;w5fLe0Yz~!yC6!Wd3PvU~
z@7PZLO|mmnH<C4VA-Ddm^VPaO5cNn#rfb~MP1!nAZJDxHQR)e6<#O{uTTpPYy-~^-
zV!(wU#-^T$jPxJ5e2Ix*sZ&$_i@I;tTfr$sN!Tyy+zp=BzYlm)$meHg?=rKpR@)<S
z4s*qci_;#uSLr#vy=VQcQVum7k`+ucecfKxJakL)8{taXiqfo)87<L6pH=2#8NrhM
z`Ej@hkOg7L1utzJUp%_%t(v!Kq*&L@FSPn!pX#D6UPwtYBy~(noxpNBhu3(Wui4eV
zd}?<N50r)6jMxFmDpp>W1ZCn-R(&KSC{tX@qT9W*L4osuqQLnFJF_uge9OD*dokvQ
zs3o$>khI7r_S|}=T6$+QzDf|Ut3PDSBPHxoS)XeUJoOt(Q;{}gMGCi8H6fnDk6@mR
zpQev#X$U#j-tMcm^Q3FKesT@=ukg$`(W9~p=#C^I`+yLG=*8@3wG2P~JQV*Vf|pD{
zzBnz2mp$n|&!<9@B7$B#lojDQ0!A32Sao0L@lKkRB5`1RqwOzibfBVhXs~SFN`vjt
zyC+-8+IbyS2?+^|rWxmVY=U~L5<sZAj`^f&C664uE=g35RczN06r0ZG-eb@dm?rHu
z?nI#~mr1`F{6bhG(?Y7J%oXk>4HRuML=Q~4QnlQ;ts_zC7V+dH(_t|0?-b==Fn=#_
zA|5W#6lQC?Ik&OJvm;S3bST1PWnKS$XpL9LiQtzN__vxXP0uAlm=Nv^MB(&Hr_1*1
zx^8z3hBd$WdxK&l-FBuQaJe(tb?{@nJFq}f`z@V;-Ag%eU_)6MQkUy2TN$7_GdDL@
zQCZo#pwSSc9E%fSHAaXQI?|tTa%<z;^2ntxs$IJobRlfkP*PS|=~Q8`SEpCX2{{Fy
z|K=}V`?NHG^*76C5(SancrG@(dbsJ_Gs*YEd}?maPs4MzwW-iqdNg7$3Tq-k-uFx(
zT2eEF=bGXqo!<I=xi=Os2wEZ(tt#lWlzn^D@>+Rq&s*a8VZf~KIR5%{)S(V<s>Kwu
zAo?K&Bk({{(x|*C21fljgI8>5URB$XPic>V@BN|Um#(JS#o;2Hvmj?=*LG<pq7rtO
z-avj_VBbf~lizzx2^sdaURw%}1_yF}KNZRBhC8!&0dJjLT&j&V^Xk&B3Q?S0=fX*s
z&FI$-(i`l`=P#j5A<agAg$xM>iN_LEI-V4P1nEKcQ3#@c35<LkF|XgB3T)H`eyFW=
zTQw5F3J~>|aAWRVh$B_y$*$s`cS#SIa7)iS^1tYk1Chz&cYdZ>G}1%p;?y1cqBG<&
z(nGqvXXsLeo8uY1bW-_6u}t_Zi-khBYuF<G+TZPt1LYp|^3LxPa?3Fb;g%6_y}MeW
zGbeIBk#;e?KVoHNWf3F(qUp!EyZ%$eV3Kc!@Qf||`$j~)TN_#1G&VNwc>dXKM2Li2
zjM`?MYbS2dQabR%aXshmyt6zR%XI;qc*K8}ikkXygZ)^3v6cqEDhN^nm6rZ8$lqJ=
za+^YhSVvC`Lhkb_3N44i4HW4)*z?oN=2q#aFj{5j<V=uV^74_9irgyK4b8{2{q&>%
z0(4niff^qEv|hRi*?GO@%1<BJMar=oi@s#Bi3^(73Mb7I%;zayEj-b$4NAz&w4E(u
zVPVmsj_svV^;R?Qu|}$L$cXK$=?rk7a4)k)@#dl9;Nal6<&OzFJ=Avv55y1s8QO7(
z_TFvdW9q0W7mr^l`Ap2rfuqh-_r=1M4mA}8d|T;o=60G-x?jp)nrPo4iHub|*CmR;
zY^12$TGm!WX|gk}?|+wbbaPWhfG4>z2l}T6Gef{DjOD5GCx~a-Zh$=d*xB!#WWU;Q
zrQBZI*lvpig|AWL7b8uEktfjGJ1<C13ay}j-oC>0o~?iXS~MzUT=YRo&6{v8=tFe?
z+o=Bc#LY`Q005WQ^->AT>gzo_4aiFi6vePIw!eZCfCM$cdY13g7NB@Gsp%xkMtrnQ
znw_3DvWL?VW(sv=>;R<Aouw~jwOO5lpFSN~iQ~q=!<qMUUEk%7R|6ld=sn-qid2s3
zmmfEISp4f_TiZPhvrQ3#^!R8fiO_)zty8WK2zWCj6UlwNa7IR8`EzQ)M>f=w6ZBmw
zAH~85<$cK<AqF5Z4*5`5zm)d8cbgWM3~1qpBuSjE%wxUAlFoRp>BTHNL&Bg;FRZJ}
zpO2(GMqu59Sqxs*P30d5EH)oOp9#NBx0#Cz|Iy#yFUv>4aZ*SlJxghNZ<79nK$fH1
zPu8pO=29GL8R3|MG=YpPQ6+;s{5i{jzJ#GZ7}s_L*^E5EdA32==-&OIFyZx3N@!W^
zJ>jC~9^p}_0Ff|Y_L>GfUjRNXW>8@?=A)|KQ9IdnBu)Od6pcm0c91m>;6^soc`5_c
ztBSv}XRq9BWs%uN97Jy&O-^{!E|m)C&PvW%Xd*i!<J;TP4U*)Ri~I&QJi`a_L@woC
zc#um<O6IbV5pxQF+TncTjo!&jHm)`kqC9yz|Ja#{ZNdpmg}+7KKRikhQP@>(7^Uht
z@gqY%ihNy;mnYhO9Q-7)N^W9`VNdz#TYJtnd*>+_VT~qv^mj}h0?ry278XVTloD48
zWlguw4Sz%DdVTuWY0K!g9?i_m+*?>&1k?QLUXKW9^wjDvC~FF<GuUfP+zUSy`Jr{X
zuKOhW>jmDs&;-s@8kd(&?TUdWR>5G5M1_052P1u#yXvGTCkQv%M7QMv!oK1I51Ut3
zRgFDhV3l&LnP{GMHh7%PCf`3YGNL}(5{;ffdnvcF6apO40ptDnjft)@n*`~>S@1fy
zb$D}*GxJW~$g*{0a9%S{FhQ2P^ewIY>#h^gLNW+h1}JFhmLHE?6859HjDG|4b|d<*
z0Y8^Mm<q?ReCQe?7PDB_b8zw@4)1onM`qRS#&M)6aau(doinP_wlk9BKMvFyirm6~
zAalfo5fqcVl8JYey#aq#d7a)RjGAfykU6L|Eb=D7zx#S_469ICTidxaUi8G+%Cg%E
zDo$65F6|QO`%K9FlaDq|=KcHk&-m#zr7LnAo<w4P@$tz>knO3nxZKg`aaaPXEeFh*
zvQxB&9k1hc&!<`F5Vd2?zYE;Ndw2Nzi8G_rH*b=vx1{b*5d#JY^MoKMs!@g%@VAEX
zuXieh90DXKP9E!N7%WXsf0{Mo5zPsQt2ajw0UgsFilTjhFVymuvNH9_*yG^rBYews
zH_atqOz0C-bJ7i@If{(oI{KRR0!`7WcNLYJ2H@1sx!ZU!FFRu%nwJG*N}f%|Da4aO
za&;wO?>rv%ZFv4c-c$|p1H4<Cn}4%@`XXhg=l}+OWR)^xq=9Dj<&3|SD6d^lCYgI(
zN#`K`Y+>(gYWd~j@64c}AU%n7OBGduPcc*Gt8Ys}`5wQ{5JKeo^3@V1G!&>wvpx{B
z^!d_f(k^|d!`k=99sx=bOS4w{09jm&)CM}{j$%G5#cz60Z`ZeEJ?gX+IA0V`oSdG1
zEnG8JG{*{i0{$iM31f1K@5B>JYoL{tRsVHuV7^QAio<B;Ri~r;ZqwhevhN^S;Yn%t
zIrG&Aq)Z;n#O18d&g*#diN6NW>Y{rYSd$65?+JDAwlay&Pfi-tHQiFb`_X>3GlU?5
z5eW|_bPISbCPfgct;=|FrCAqCQ-$LC^Sw77GGm~pU0Ex)!1xr0ba_5Nzd*osnW21u
z0C=W#0^)pRDKYcz0^dcCr`tJ*C|%Cpt0m<}q?$c-;?15f)M43v764HZxc?5mS#UpP
z@JZ<;;Y@<V*4cHXah0e}`P3>rRwxrIhvIk*7%yYLd-Sa4ybLdgJKn!1qF&nQqt>*#
zI9QY#Yd+{3P2jJ#+-3ET)g+j1E95?9%cRL#kIhiS0ED4=o@*w2*|PJ^%g)r?QJMbQ
z^=u}(N<aK1&|l3))Ne^0I<Z)3+%Qo4WMhL3=0o)M689rFbO9%HkT`R#DuE8U{_0j*
z8}DjpIOT-Ajk7V}T3I713n7SlkM_*(&XdEl!NUm&J`&1EBef)Ui}y{p5e9n@4k!=m
z?)OPi*|$HSxSz*>s|~z9eS~JT(yn`uEBM=@blQLex<$oAzjKdzDxc8`E2D}79kX#j
zOYhvpE(pacp_8XZ|BVL7clH6bcMmVp><@{M!`#)?1R)rs*)ZL}rpH!g+C9T87@)S@
z!9|+M{{KDA$&!GmPRoXx=bfBgg=G!*^u4Zn5PnGtE^@w>W1+YVKZ)>SB?-a&2_K9j
zd~D?f$$ZsF!^A-(qYntL7v5LE4#Cu09*GXE&b{=4*k7)?08Y<^F|3)uEuyj;@#HD;
zoa}5-uhF+Rven#RGY@O0TAHlfL9<&aBIu|FpQSw#UuD;_p=A*Pw(Fh(Rs;Ff#(HQ6
zYFO@RmXJ)6rKPgTedaVonn07)uy9x*)(_ZTrHmcIK?f8!h>&}dqE+A!Oxld!-7xXT
zR^+-H4M9==tsLzU>j!H8aD4I1{g}Y;*`nE>KHHp`Q7*d9bfbWGnZNHz<RiT06(3sl
zYdf!2iyr*V`#o=Otx-nAP&@<B+#UmBKN+@v1!74lBa`~4_G3vkLo6vChANm_KqoVH
zFr?7=J4RuTwFBMG&#H&VzT~jWKEv{x$#md~cgr1~VMljb^a^@6HNI$uVt1hFt*3#t
z_rhOpyGxh%AmNjq_b(IM<nKJMO}cEF*=lVhG0$A>C{lbaGWRkRleRy4*TDi`3;eqm
z+bmGK<<KQ!7JruipJ{t~=noI39iG3LnH%nSt|=QG9aTsd`l01(0VB<7Zf@QyD&o@J
z;Q>!5lp0h##RpJ8t@MvuvPaBscxucV%aA@kXI_x2hcGcTE?F-(cNA-Bv;7pWsxjc^
zTVpsq6CVe%-QmG+Dxk}9$_2r5=^imwYRj^wesGu;uWXMP5mU|iHl9gO6aQAB_^qU|
zpRp}7N7A^Z5-C>e?F93Exwf{pf-HxtRCZdHH+_-#psU&SIu^SG9TNYF_c#jpAm*yG
z^Kow3p`{8uA|oS16?|EXS`+>?7-t9z@2+UrPdB*appB0xg3dRGwh2TU(6#>*0k@dI
z4|jKW31n9TF}`5%$9H9sN%`o-+)=|-`|VOuj=#&JyWL%fc=I>>rgyDqrpiQ26OSIW
zDbCu2CjmA*D4Yu9${o`B=)cI?(J(%+22Zm>ak%#oFA7+J{2eO<SMfh1P1m1$dp(H6
z;1+ft_5{_jPr~~g@J&*P>?_*!HTttA>`jM{Y)9MY&y0LE*SW~w<0a<i<~j^1W3n8l
zHIN1rN_pey0IEd6p{7e#UcTLTuGT{B7pb=JT_VAV(WLMnU#kCwqg?ok3rY+sMsII#
zKZlHCsjcyjkQsZ!1-|?^{}~haH?R?zVYOWj-+XftaMLn`{5kv*zk>B!!!w5(1)8-l
z!W^ty$tWM_=|kk9H?OCuK>A15d#r<9<mv?98q!jKTG%cAp2xN;!)rN<gJSo^m~`pw
zo^Ay~g77B&pte?&2}*~k4JQy>Tv*tqrlJZ(IRCYS$fD7!MK{Q<?vGy>vs$#A|FXb1
zcpxL#PLv?0Ro48Zd9MqiAA9~?2weXH5l3^WwAlQLojUe2KIEd-VSonYKQ}k8oi%?I
zkE*rXjuu7r!89N&e)1T-@X$j8#X{Sdha7?c!YSrgpeLyof5Kx6fAXddahzRTJUPns
zscZMhs%KPvKVc~RtyLL*3;xGbtkHsH8csZ?$tQ5StdmY8bmRC$Fb4()rlG=?mY4s2
zWTXuur6hI6M~xQFe;FXH5$LfC%wapWyUX5>A1Vl0)~w(_4W{Cc@PXLW;2o$3VccLK
zmeTM*ERHO6-$EuKGw#m?R+?l%#nu%c3w)oO`@H&;o{cW}QhQ1|%BrDT%9{WNTr#zK
zd~{NPMv&Wn1;N~B%vasbW^LZw6<KI=Tb5ni&+%G^nnhKXm6i2jDMh_`z#VT;g?YW=
zX-8Rzou8|jawLU=iJ*x^$gj6{X8vVUyQ>#xXW@;TK3g3v=jZ1|cq&Uqo5+r~UO-{=
z)&P4Q9oVsZ{vC46)vkYJQcf-`m7TAc(aFha#mU`WcjxL?J3(rozO(bbMupKH1Y*Aa
zniRBD=`G)351vqlWNX2da59~P!@kb#%LTq^RNA&4v^Nx)q{4+n*mgz$SMejrWG^<j
zjCMaq!m1&2W^%IOyZF>B2>fL<8tx+qHfA2z-fwG9X|z5hbS1cpgRHUiLVi`E&S)nL
nhin_{t*ihqvjwhuZ)wW2GE1d&H{$U>t^gV;I`CR$tH}QW>+la-

diff --git a/static/images/mine.png b/static/images/mine.png
deleted file mode 100644
index 386baa3fcda5ca6d97c3532897b2bf5f257432e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6168
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

diff --git a/static/images/selectHome.png b/static/images/selectHome.png
deleted file mode 100644
index 5800170744f21aef93cecdbaa52cc34b42cf9bf4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5473
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
Xk{`!7cdfhz00000NkvXXu0mjf=1X{G

diff --git a/static/images/selectMine.png b/static/images/selectMine.png
deleted file mode 100644
index 69b7f194e2e53e7f8e2bbac3f93f6f1b873e839c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10344
zcmV-uD3{lXP)<h;3K|Lk000e1NJLTq004{t004{#1^@s6uE0S)00001b5ch_0Itp)
z=>PyA07*naRCr$PeR+6Q)w%xruC@2c0AU^kK`Yb=ZMBZQwpOWDEzV*>fC%D%B7<6c
zYkTkYXWD9?dOL`OpwL<h62KF|B5LbUu}-b?RO5hJoDjkg<|OCry}n=8J|~)blQSd-
z&Ix8c59SZo*?X;Tz583={1IKFivnp-fN9L_n%YGHbOELd1Zh#A3ovPst7~!>V7f4n
z76rbPfGG}#b?>@@JfPln^XnbQbsb~!+^CK?G$BRfD@Un-Hl8t}^59EU8>&dui$*=_
zK2b-u_)cvo+H+e?V|jVGNsH>8c=DGHFe1V!cir3HRgqzI^g!SE{R!0%f_(w$Ctx=M
z-2@2Pb0twvgIyrD3Amnubr5U-WK-1mYw4IZ1IMl2TFx&AX!d%*OrAT}&Cl;W$Y>b~
za0rS100#-o5CM9VEP_D~A^H#~0+0tFAAl1828ck=C`3JgE%ATb0PFy;36Qk}KQ%CG
zVepYJk&id!=WnVmDe*foBWZK#dm~_291gqt?sN+q@*8?-(Ss=X8X(^Q@HLS8LC_Cm
zK14dSe*x?R>H)4J<sAWDA>=ioUhQi0>DKMrx9vA<Sbh1(k>1_{o(>T#7l|<a!C84;
z-M;&3@lF8Mw*Wa3ma7PQ08$9hauA37eCuL2BEf$XkN9s|5>4#yM4})q2iggsp1?;!
zdDi#M6WYPc{oa0i-QFVS>{WodYT?pDmBXVUJO+@%03Ia7P^~o)oNMr(*xw9}0DL6u
zU!@ehXe3JTeF5GS!D|$}2q*7_*<;ULo59y+<x!m;Fy-NJXv<EwFq-G@t3=Kc$k_mn
zC+TDw80nr6l>&^}2;lDkmJ{k}Rj4=gdiB*E<>lp_@|x<@fU)ZFpr{&VU`B#C6C#H}
zIEadcv0EmyoFpy4SdJ50gMnZh$aMr>G~|759-o{!di1AhJugQlcUr(qU$m$PblwqS
z@I69C0yqLz;~^m?hs+}Jt11RyvjM_qK|Bm2kIybEc|AvPkn%D*9bl{-Wkyw1kwM<E
zgt-9Z*-ELQCYM0c2KlXwBO+Gaeie|FpkBJ8ar>G-PMXw^@`+`6Vy6Sl<hd&g-EO-|
zsdz2~$AaunSb3#`TqS;mv~?aSYf_00v{^F~(*W>e0MCKAv)?;4k9QU=s#5{x>cuMt
z8Z>;@2+9cl2bJobuGZ61qY1uvBQVDIAlM3W2O$vwEEh0=ohGJ#TO*z|=2^pDckMX3
zSw^yQl6?lO8kXX)!f^cBtOewOCfTccN3?!bXW%rQ0x<R(np$1mjg2x23Re<5ie%4r
z3bj@{X$<}eBA;1oiBBlp03|z(Fbcp|0cxN@lLw=EkQe~SAb|Y@Qb0inw3cDXLx6(R
zK@$KjF#O3DfR94?|J$!&pMRE58ky7AQ>OsT<drK6^S1505KtEi@Erg>f-gVS1Bwft
zv9FpR3uHAQH41#oh*{$R>*-*J4@9)&`B7s;yMA!`epHjbuMDB#8ka`(qHqX^0|e$^
z3J(Q%sM4yJeSSMYY~Qnv<dYy~SBx!wGDSv}m1#K-m?>3Ny)~TUKwb{P$t3%xsxk+5
z5c?$?QwNa`3H7#tyrGn=_Q8)R`lFER*WOxEVy(0(kICV1PuDmDX}lo-_ov9=0vt+U
zm;n20$H_OopAvZDg0Kb6Mu3apb8)}-`@T|Mo}2E3Tm}rw%U9`52W|KkzzHJqeJV95
z9hKQS4kb7Uyb9t8<MWA-=hV!cbpDpOd=kGIQpQTliGi8L+Jc7EV;|p<BZNFz!0$lh
zU;y1fIw|?9te6x??R-y&`&@dnZ!InTfMj}iT)VcB-j8w?Fva0;sDFbqTxowSAeTX8
zAeB;Sv3$X+1eP1h<F0X5JJNmIuP!=mSEdi5ynL0jcF=}y-MZ_(p7IZ+;VA}k9)KYv
z-IUi%dJuVyz<dY#!CS|Vem}kA-2Jn27BJHnJ=g=-dASg!B#ueNAQ#s@tcJ5bP+5hK
z0rGgi5Z*2?DX{|XZXcK2d1q0#{Gvle@Ld5;C2=HxzAZGPHrJrEhVlI!1fCblto068
zR+p4m!7FDtO-=&FviZTDI?RW;jZ`P6bPZYdEn?N<j{!a{z#nC+JUd`R&8}?NIDWWr
zVYfzIFj^qRAdZKTz93^lRe}-sKSe}jrV;+m+g10$yeqD-T3b$xoCM5_g-Z`NT9*)V
z5w-q`6(AE5Ic7oiK&%##`?Pi!d7Hd7bEcNqAg8R2OMf5k)2$H4iKsCGbE?vMNJ@LL
z97W_+5r(^mWX>%mC0nz$i7&i3w*b>*C@Zh7b~kx4T7=iZY93@^LKz??Fk0KnM-bet
zh<j#@FL^On2yA^`g1m1DWh^150NjUUVp%N4Eh7LQ)1q$N8r}AKt{C-l3NVvjc)@kw
z{qO+#(aQ<WfKs8P*HK`Im5)U5SEZeq6{Q!vnk!&wUWX0A*y!U72umUIeUQD9*^sO}
zBfeP;!CaE}%^H8<>Ri}YP65UWx(3@XQe>$CzNM@>lh`<Cg+Y5?-78xEa%cUvnq2u3
zzj(MYVYtWl1aduq!$B4%0!>Vok?jI`nF{|~F}CD^F2H<&0#_|rGE|B43y7QvpjRvg
zyY-=zh8W-4S)L-yf_1K{%JsnOX-ifN7HKS{;9~7KU-P{rF;v0Tgv}&w@*Vm8fST+G
z@GVauXE@Bo^XKOm74$e#eE&A>y2ts^#EL=8LTc7R@N*O8p9XwTQ=1KKD4nl9?h_lR
zJ^l<L69sS+eH3w3+=FnQBkE4SZ^0WCqefXjSk^|)0A@<nvSA9|Sp=tP$2l<3*B3XZ
zZvgp}Kz>y@uEd5wc8X!;naxpNAe1s|tD#Z_ZOLizeOf!rQ%%<6C6N%9%*(RIlrw;t
zwxs%G5t*t4Cqt=ziG*F{I53{~cZizf8TIfT6E3Lj6ljTsZ1U>r>Y*koqXqact(|^t
zs@gFPFmO%+ToGaPhI!-0SyxBaM$Q0cMpgJCAM!K8dV&KVOzT9k@&8uo1pm-bFW29B
zS;^+CQLh6po_<&LiK1{DAXWf&6KYKsH^3t<-N`e@p1-C8ukG+pvksW@@^V!>Vnm_i
z%az9GPi+8qTbfavMO#7lEs*nT9hp<ThfMw*rt}vD{JX+mRg}x2cpj+^O2kpM<G}Z#
zFKP0}#zda2C@Zs>msuIv2aL5*cxspunQS04sFZGtc+I|+CWGGHAQrE8@V8vojM_TY
zYv#}I<+}yP3DtE<>(dfhfa6#2dw|>_p4?YCvGkp+pe2!nzNZ#seJ&B5cajJu3OSlo
zx~=$J3mD(`H#V7PZjAWq-ofv^zCPDAqXcy1l?xa4cXa+Q08EMpgthtsTN8pY{(689
zLe!nJ%SJ!Fr_Se#@5wrcvB60BQH(JH8^-XR6hau@RmAjJ<4XRLEuv-Wy@4qquiH;V
za2dz}1X@kLi>udGR(pcbl@;ShKbomEr2Cw#115;56ZZ-b#Q=_M)6Wvq7<K{jviRn@
z$_ZniO?R`oHott;DreItwUZ2ZF^Qw7RDNsM@n=?F;uZMv>)98T+?TDrWF0V57cB1!
z9lb`87YJ}jTYw1!UdTETd0ZL!WyM9MIp;G<_Ylj=%biWbN1QGS;{cqal<MAEepQgT
zAVD_68VG(myR2k!y6?)={Hz1!y2UH|Ma-`M26>(V_GcTx-Ep@3j)3=S@XlOu#&zT%
zY~0TP564-jBq0|ot$QR4e-No_N`bkdHpDx!6<C#Zz+Aa-`2a_IKL>FR1Owa328aXZ
zWkB5(@yxP$6H7kq$YJHeZ_7p0rbTyuO|&X*s%kY=Y2B+Wz{L08Xhi;>*Ryc;;1^$P
z$cDh5b-)D4Y0~&B0c_QUo^5GvfrjMy&qDF{uCE@Lc~R#~W^W19zy>w!kb{-h7Xosv
z(z<s-z=(;!;AcCcZsk`lK5tt&*}-(r^go-d17`AF%LcjHpGCnakOgf;*$43<#(%~b
znI};`G-p!Dy7af3TfeY?`SifUhr2YRn*{nFDed;QNtmsTW=Et5eh%NMtS#`iWWxrP
zb--M+Y}p{M(XVU@+8zZkln5}s=Rc#w%vIVvblbRbHqg6M4-1%0ha7T%7(JSh>#3YR
z2>~O<gD*ET%F1=!vH430n5)9!edwWrf-@7<or`f8^NcZOui`MZ!$%CG;%LHLp9+To
z<faJy$~woX`%(ht>cxu(`fzW7tsEujok)f;zW)y@^*inH&wGmuQ#X9Xfu53Lf<H(q
z!x&>rp_Mo8kjlZI7H=;v{}ReD)5GEZ;_(JR&Jzg|zgo?iwzcELm=^(A2yvEIl#RCK
zGCK9JTGGa<>cc=5H`V=}o=8iIZ*&`>Zdm7<JF1I|Z6U@zp0AX38745?Inf`Gya0lO
z+BDo*!1(4(koQpg3o1%W-|N(90T9?>8vJ9Z)fkYMD5ZP0rX|I_^fm<XW5SeIj4xf7
zt-WU*FxQ5|eY_~IYD$tXCUAHnORq8V35Z9uc78Lf^n!n8i)fj8uLaCL5p#-w<3Ns9
zN_RKr|K?!DExkJhcta`ta@N?Ado#6$bf1%Tz+5x`-d>&)od|_7@#>eY=ImIa8IkQa
zjns(w@tm^K=hNM6uFVg8No&`S1JncoPG~D!)2h_Qn5_i<0Wr7DE-U?Ww)T>Bz+7_Y
zilXlMku!}*8Hh7T>IA7J_RfAAKBmr|Q1V!|h?c4MPJi&hJlV42hY(zvC~-dq7=I&$
ze}(29v&R-co~bpY`<$!;#=7`><`*5|8*@oh_Tr_<1E{?9p!$g~1%H||?#wNjuEdZo
z0Xs53b{*p;0WP%}1hzbMYtM@Zj(tSM#lDfHbH<mv(vkOe<hNM|jP=;oju_ETMR_G4
z|3#(TL=kts=Wi$Zdr{uqwOYTB4O>J<2;Tf#8#q?)79I{`{#$E(b|R;vc3t?<Xbq`u
z@*B;nY+AXq4w!&|<>hMHR}Y;`#hXRYr>z5to5vdjcmd>sT1OUk)|lR@RaN_gZV8Qy
zr`AU#%#w(e0eQml&6P7Jl)jk>z_#}pxd9jeQ>*S7MVM<r980R62?%IJu+wsxt$zIt
zcTJdJ8$xutF{LVev<7|&;5d>!lE`gaoBAi*?}++QwhflK1DM7497f886uFq%`HD%9
zMjAxX``#l$-lF`*=d&3_-wvd5N>x=a2kyB|a?8zBYH$jPY_C92?K3*}_VMHE+VRee
z{Um1qbA346vmvU!>BHQt9OvjnfQcJ}Z8gkCo0??ZmQ5ir-IK7T*ak$^sT3It%6U|(
zd)t6fHp<YWn7ftXg8E$rPtUvJ>|N=;Gn4ak1~7J0)0f^m-1yO36>z%5lDiVE&sw-_
zi<zH?Ts&}VadBNXOy%hwhP7<d@qY}+L;!sfnGxbLTZD=~H+lN@S}!{x4K4SWQ-HAn
z;Yu9qCb$s5!Pc+T*4-XUIq@0@E{AZ@`j9-F>l%|)qa%%SD#)vykb6R+f&-r??a7*^
zcBSPN<HjsW7o59eeog^q^4z(FdENV+0QlDOIfi5?NqrbY!A>EoTvu-DSyS_AHo_KD
zJ(%fBs!tSO{wEN06?-Mxn{~Dt-+T&UCB@9IC@cL(s_)sI^KuF>)_c3Qy1FRjaRO}N
z9l<^zb;80sv1|gXYA%O|J7-TQ`Pc3wSbLv6{jMb^iqa*vv@gH`$&v_T>9O8R0=dDB
zgq{g%3+KSdDZn(-W5$x|6O3Srh@7FdZo9fc&?Y!2h!_F6T8z0}`&>CIhXTZ{`5zm$
zjxeqoPoa%l9-hdW9p8^7#m59!Xrpe<wkn;oGEDQrV##fxZ$jZllE<f1=T4-akbfF-
zDWdfY`u}S}UHOeoSv*;Y8430w!s6;`)jx`_QKXDiX999aGA0qvziJdg7zTGmdlfuA
z@9gYqMmY}{yTBhTSu!+Y)U^Q5ZL;bfVErs@-ubaaFZ;8dAl`(*qdswuzoYK8Y}L56
z{j&3V^gazn&J*w?0Q*s?yhPxSSJjFF`~aeU6A76mgKKKG=aO8OlUI^G`5^B&RQPRx
z<D23@Y#MF1q+e$&D$f((Lqb*v@TjP~*9W})iWP?UNK;PR0L&?@AFQ-GT*SYS<VXkx
zr(6l#_#Z)dkAW=AMf+0D0wxX)PF;L=F@!&1OwBGxsct{vi3I(lpB3_M@#XOWdH8T`
zU7gIGJlV^%hucQ~<D`?+u5H^2c5JUdgwUrd%J~8uBtVb0ywLyl0mN(bHpRs}Y`yWd
zj(IB=%>=m)7))ETWUw*%G(}vev~zeO3-D(L(A?1#vK4}NNxlqYp7Y7)cSUx-mFd!~
z*Zw}-r_sd-<;XVye3PJUhcgsFVGAL)O$HfM1hvgf1S<e6^j&#)PDysFn76gqoCl0u
z_+^V156lyH27wC%a&QXudxQN3RS#m#%{L09MuLv6d<m2fl!L84u(`0IVfzR9`3<Rl
z&9RCLpA`C9_f)>_1@Zer>4Ta|*4r*|$68LP9H(2V{gUFbE)4`;7xH%3krh2_YPRH(
z+|nt8-j<8B{+E4>8ESkzmM~M|b`0BxG1XyHO6|X(IVUNrt?h=QUNe;Ul`^%CQgu5E
z3L3B$=+?Xb-=gt%*45GJ-CMa{UN;}n-teRQQ1f6T96|69Kx|hwYg^Gxt_q#f74-Sa
z?YmwEFc&@^$yGa2^Kv@{hp~&bT8EogbPz($>69QcZ$!!sLR<EZHpWKZZwFBaf%W{_
zdU4wzvKGV!Qf)V61O4WX7~)b?zENUjk$nO72iYAWy-4&D2?|j6P+F^WTKL5i^DOs!
z*w9qdQ-6(&820hJV~)w0&LypVjhzNCG1G={+T!K=0p4W<M+tBsfudC8gnyTB;>}{4
zoHTX>(QYD}gMZ}qfD@4(W6n=Ufc%*7Dg%|)-E0?|K#R9c?`>DvRC`Z;ZfLZxwWT}W
z0L=o|k3KN7tZZG@Y(}Z_>15{VG@i4^rrPUisP7MqP=6mjCfJTA@iOyCdl4mBq=Bu5
z5S+e%h$V^1=W(|7`4&L!e@}ByC$LT+e}`ZJ8~tZ1E-C#q)0*4vI*?AqVVa3hF6FAW
zdc*)7;nxM`EGmu^30mbO$~Z_&!z7K);~cKt=Md+Dw%b~b5cev<BihBkJ_fd?DsZ>^
z<r(~8rv%K&tIC}b8%E^Qn8C`ZbH&KH)`egTLZ@>*WRQ+Y9~C#;)d6B#3(jW*kNMqE
zUs+si!%g>i%4^aEw=tpf04DC6*}tJ7e^-9~AV$m~RO$!<M+)$D2!;dHIn*BU-$))e
z`|qUf91D3-iGC6EYa$-sF%83N>w3R$s!NJ(XW5(vPp1Kl_4=CHEnkJBkEc?$)$c*E
zidE7JV2`-#Ah-8J*q)R-A=oO!76vVn<s}h514du!zk2W|x!SL~)2P+g+<R{?e@El~
zqVz$Qn;4Pf6?vQvxkaBD$I{eP+RKhJ@w*^T+R96DqoVQs4*<M~z^G_mh0k}mW!>6}
z88fol=BBN^=HwS?)#n+1{&NUBcJ!c!qs7Qs08a(6pRg(DL4rO*?blW^aq^jahHq7P
zh%|tB5#U1-;sf=r`{DM+#$CB45a%RdrY>LJ7xmHO5%d${Hz*h;z!2p)PGB4}8L9=?
ztQocVn+OM=3Dg<nXqMwNa~)%R+dbCyuY4PjCzO`IRg4+)S}xgVatbilhQkFBPYoly
z<6!i6LGxWIJ@_+~HVp$=%YzRN#Eurg2n=q<cB2ix?0N|50YuPLfCXYJJH=$rAPy(S
z&6Ei8N#sLN03zR(xsR9Ph|RXojQ?#91B!tsNWAw!ykO&cNO|0M`Og70xzTYhCjisj
z0*6K)M9;faz*87_dnG@W=HLkrCuS^b_9fZ#Z0<B~P4F8Cd@2yz_~BCltsokKNR$e`
z7@N0XoLK)R<_V-9h<$=sV_;CcOl<S@7&GdLs2Iy=yI*ArV2U?C<z`T7gmPEZbN-yy
zw_tO{s8NxaJuy2Y>wvNH%2kV(AE3lLnTn$b94&%<ZBl;9zM>Yi`%I_|n$U|i``i2_
zTLk(e3fDp5BY|v$;Wk2QLA^!9t2g9MEr=+AFG?BDnBY+88bxE2M4+|n<cnb;wRAHE
zeFV~5QS~&i1*v5)1^bG~ev0f*twWZhedb?ElRLHuxU#;kw}kkc0Uq!jypqi}epv;K
zy@H|<d=<oZ37##nZYF61r5Pl_ZD35qc4D=@8W5X7)Qa#Oidh5UTEcvw;nqgB`P=7A
zZGX&(<%%B;9ons1Uay{_#d4h?BL02=_qW_J06i^7Vs8j~(I)1_LrK#yE;jE?jQL1_
z`vLP1l{`PYwDi+#$TnF6j4jvIKVptjP!|YsK7p^sHJ|j>WUm~{4XmaCcpyHY;04?7
zSq%RfD%9`6_qW*4g~1!Uo3)W5-x|pdtErI=#hf%bCd+^NQ@$}`gk7&50_a9SH{|89
zV29U7N%UY*>L>_~0q`{t10g7k@3Gl0mCn6l2<$Y1rxj#5Li|%jNy&zE9*~K-=^aic
z-e^-|XU)npeFvQZ7^^OyNMM-K+D+J);S2Bn?920g1FAKEd0EKUXz(_nKk$g!9<IOX
zm&L`~vSE6+9oI~#s6S{1`jElO@GuZZi0$zR4pmx*(g}xX!D(zr#_IxkL<yHyl$F$E
z=vY#E%pM2K^hFQ$5VhkN7`Y6JBT2PSI<iU&O`@SGOlB>B_aO4JX#N8x`ckdyew=Hz
z3wshXs_r?^z&jG6juPT%8<~ed_F<kqgjBDo77gB4lUU%1UN&&`>uWm1EmML@T+vKp
zZilDZdw=6s4?A6yTu#9WwhLL3g!?bPGthDf_y%~3l)o5oC8PCkh6)OH^{lChmfv`z
zHH2kNi)e#LEMK)suUWIkDG2p1aHRfNLphzm_W<k<k?!r#2CcSK)6|&jKA}H%_SmuZ
z<Js+Fk8zm5#uDYZ@wnWR2=r^S``Q<`O(KYWje5I4c?(c~6Zp>=IyH36`?(r0-PY;Z
zM7<F6hWhXigz!WFHgD<3Slyc-m@DzYHwU?kSliLt7Buus^{fe{yS)_c9sx|OQf9+3
zK6o{O?~v@Bnt{vuTnGu|6xzz)*6R7B2LICAF>jT3(iX%m(Qx&mrN{b8okqbawj&(?
zt65pwPEz2+TKk!Z0sf`H`Ql4>eLg<iomcX12TTxFxup733NL}k$${Z3^$|0)5$go9
zRDmmX<IY!medQ}VZan#9KO4eq>Pt^;rj1oDC@Sh>;2Z+M7y(ZQ#9FuWQ+q;SA++uN
z-T=75F>2oK%*EcVfGMB9Dt}|B_9Q}GD3DQB$V(+Eu0@RQ=B7SM&k4+fit3sC?s@P0
z@44sNnA^Q>{OHaVMLY5vhil;51~`Y1W0ZE<Y`FC~0jxVA5Sne`-aiEr7VX|wS$e^4
z>21B+0As%#RnYTbtvHR~_o=vFjLRmzpW|S$*4gzWpAsW0#IJv-a^l2IdmTzz+0gVq
zg!@Y#&WX1){3fi`*s{_j4%eWbj4@WGc^$w!AJOFlSFhfhY3*sZ0cPrgr3XRlQB*P+
z;GszcxzCAbBe2&(_@psjg}3X#=VQ@mCI7bw|6YioAhe^Zs>sk8sh~y+<SbJ4PWGX-
zAcZwItPtTMg~lf`T`)4^fC)Nu)H}WCc%wmHE@BSXO6RxMUbp3W$9*Thh`ghKhhX@p
zJT$!U>rPr$wWC;`ym)cHJfn^>)V55>S&r)t^KE6(1RT2AD=#AJA$)|Izr}{anu-~t
zG8T-Lalix>u62Q}5_t&~&uMnRB_iNwMS*NzX2^X)F0UL{^7oDsy|e#5DB;$v=hqF@
z1jd@E+A0u1!d#*eR1Wu|pFlV_Dza>D2Ccyv2h7x}W&10b-wNb30NqnPv><3m$^8a;
z;YP>2@nyM!lF=s?BZMOXoDY#nO6h*d027yjtwCo!1V5i$Hs+3G?@9IlXB043E(q`I
zxI9gaT(2E{a5CRe3jsGM&qc_>ZIPXCWV*USs>I0Ec|TnEP`5^R+fibq4B+WXtNl}?
ztq`&p<nJ5@&)r&5Vuj)kjZ6WCljqKL@{0PN0g+4NVG6yIehIOqTaW8~BL0%fvax^d
z&~EnPAOC2@ilT;Hk>kXeNdj6EMbCtm^5&{s#5)w+FD_=!F6nr|$czAH^4u5PQ1ADL
zNR(F)GBwq!h`@FcyeO0#`>%fUsZ6VYdmDbNeAuA!&mvK31g9viijsbmG2pxm%FiU)
z@MK5L6Bz+aP{a`K1dwA19G|Ma1tO~q%sd1Cp={UC?=0Yob>Y?Dv)Z?9c^GdF-{$g_
z<G^^HE!p}Ie9Y@;W3r3@W~yy00dorkBW=~Cgc?z-4qa4$_bL2CVNvMzz14cVyFfU7
z(Xt^zGYKLkw6*jSX-zQ>W8+OXQ}`>Q@s7UlzPqEn+`Pkpv5m@gl&1*fzm(P^k_lt+
zic1>+sSxVrxmwF@cO7;no?BinYUhaR0rgSd2*~9&;xDP$!bT&Cghlv=0@LFkzn*Y<
zyV?eI959QjPg9U9L5xh+cR4UD8QCtx^YC$VzkEEkH+Y;g0fP2CW9s6&ODMPm;CGbP
z1#Nz;pO>Y5m&Cnr@T>NQceWca)`We<{r4Aywl!SURDj2J=dfMv6K5mZI1Z8L1!@UY
z^zJ<s^wXZh$ob!haH=h?B;HvhuLE#E3TqbYpEF8b)Bmm4Uun;^)Na67gOV}kaNk!~
zfSgEMsVT8z(RNa6XmZ`pgWqsd<%9{g+EcDY#-%{>+?q0@Dtxp7{)fP~h3uEebr2H=
zy!S+KD-9oPPd&YM1IGF~LU1pkNQnSPCn_6eJ*i^MP7yp#^4;;qLI3~=7D+@wR1X#7
zi<jpX**ouQtcL0+_Y`Arm3Eww@$ze}ZYb`r+XnDy5r0l)S?T@h?!4WAnZ9)CaPifz
zi9p~jO7!Bu^)BWU7~UdO_f?L&;KMHNlI~HpIX~7CkfHw;BU5Y&ZxYeK2Bd8v_=|Op
zRHWNvwOxRj{K8x}e|4W@jgbna^-;+*BLGnXuTb%tS!0Wz$r!1+9u!a@Ry(+M0>Dd!
z_y(0KNYY2r7qC)Xsn~!Zq|*kJr!?9Hm>J>lekO`Dtgx$H_ke_*#bVddyMU~O&x-ck
zn<?$&OFrr91^0Yi9J$cIOw*3rI|zknWwa0-?k6}O()egPF*EG~Owd`(1U(DSQCjy;
zfy3MnF>{<~{oiL!nv@fbqV_g?*=8Qy-R>hn`4xZ>Z59LgT*ZFNI($WWv(nL4+Xa}Z
zRpE=8(l-Co*2z_5egf^t=CJOB$Q{uTZq8;B`Q8SQ*7h@fQFw%q*8_4Y$-#-V)}TrS
z@PwhdrgGecZ=_0}v;bqH>4pG3BOazva2?2^wi40e61jD!za*63RgN38Ak{^6&1)Y8
zu3WfqfTQ!z24oVI{#GKFfzpmuv1_346DQw&V&?g&wFpcLFg6QdQ~sty#Te_6zBHjK
ztu@5>n~mU)@cr=Yi%Or{8`47Bca(ePSLO5P=Wle~1EKPM1fVRTO(y1){7@isNPorb
zapT@fWtC|GW^y>()AhvG`kx4JR3gB{n_SxR8b4{Id2rsiaW?9|%TSlfsdQjY`P`L-
z8@uhg5#)4R^1iJ`8K3*~aGyXHR*oO@L@KXM3outMTt2{I^a>C*!25{idMB;E$a+Z0
z*8sUX)y1T;;I27IC}3R%Rm-j-%vDevP9U!}Stcej_&Wi<B1UFaUNk103T@K@Ox&&h
zGl+aYVFqI$iDMHePtf3h_H;>#R5rf1&apne>5Hn*hQb69oYrQLRjlrx^<dYE$S*3(
z##E+4le7RcZDIHTQJ6ypaW8poy&!f~;Vl7HxXQU>=GgPsq_UW<IT@gU<uG^O{SA7m
zn8amF(#AQ~LrQ)T*|Fs}^CnNOPiBEn88AVqj)M<B3dY<{rH)D19o4cs-#lq+>U*Le
zxMRWvwHY8q*CSG+0I#|0u6>NoKT|}0rW|Kb5+j~ap^`?;>f@RZl7*Y33>aIHJG#p|
z36NVH*F89)bvM?0yqaQun`a`ge_4~!Qaj(w&ngdxLmLfG5#P+wj{B9i`ec5twAexi
zm>2SUJ(n!7DrLaLt|K*yG}mdzIiM}n2HPh+ftelM&hmLzl-Od$U1JYZV9KJU-&9m{
zX&ZO6F}~;~XmsVT$&9Nh1Lm5g%MXnj|2&FJQI0dTRn*4J&bBD=Rx!A(|GPCewI@ht
z57Tz9d|eP{ZOknoz74WxYc`n{fO!n$qWWF3;?B!TYz5LbN6LVizI6E!@cj#gLH6Cg
zt@)4Q3$O)~KNezk|95I;b^#_kc)Yf1*{~@5YXMk$*|1jK1fP|G#q*?u>2g7`(9P5V
zQx!hWP{z`*R5^N|1b}H2@@?xs>c6^XZWmy(1DGqr;e8!X#zQ!U<WWfg^Db=JGv)s#
znIkfFz$^}*WCR!6N&;Ft{aOV~Ogq{I#phtmo&DZ@b8#17vI7{KzhtP-5rc`O{#LAd
ze(Qrl*?jXCqs)zS#*Y0cBUjS2MN7XAsLMf|Or=^)gSFN}<D2ay9)`ifin8LBUH+r&
z0Oq>Ii~B{ywdKz)g;FDvWJqoX_^?3zxN`hx+rO#fGR)Mf>T?O1(v(5>A5^MGYYT|`
zCv3dSG7yU^#ul&Y0!(%Qb8R@>$Mf}fMf}O6`d$*i*kaL-3iN+w3^3EGs*4GkA;6JT
zs(agj@obI%C8SzfQF`H1$t;K2A?M!zRvR4dBJ>>tGlfc@o&+%4MDSNv`#+dDc5Fhc
zeCjexRrPp*{J{2!CRxy$5EV~js3Wl0Czs9{Tl{nvV6p?wAm81%Ckin|X>~?IzzBAM
zcnm&fBnzQU12Ex>1^7<@!%4R40c{2h1WPDtX+>EVhsh3HfB-PcJ&}SbU^2i+6y)QK
znkf|*m%f)N8K#twYauwCiiK@+7=N>f%vWT%VqEd_T^uGmkhv-x?yi0R8zTBzrS$nh
zjls4P4Q*uPDj(75w~rtHentQ@qiWemAO0i)XDY4xw5C?ah2Bra;MdA^S5%aqZ(rUO
zG?fL+On%`7SHJziP(|}2id+i7c9#1$&@>lOG-B3Ju+sB+%N-L-KFJ7RrY%`ASbX(8
z5;tfkG~D;BLHGX*n<VwR7+x3Mx%r8CS6tERq%6?yOZm#6*Y}nkQ<dP#pa}*UYI!rX
za1B%o@jG$w_hfw=QkG$Cq2^Fg-{CN3qP4|XSq6Yjz;}X}3PCN1*Q|Qxxwz+!lEg^;
zQl4NIHa&g8J>M|eKZA;=K>~%PuZY+)Yqb3?O{@@fbv_IJ{Gn4{m#i3N%7C$ZwTP9?
zI}Qq(V$qx+;2;R{sJI;>|AOGLM&&(T=Qv4UoCVr_X<vEOl0OYqe#6;NJg%vT(|!Vk
z0PFy;TEu@$!GFG@tjsq5NIKF2j7=%I_>X_g3+3f?cO|cz7~gf2qG->+a~lgo{`U8Q
z9m!CdbX8pwGD-n^JD{kjXTIYUdO(QvMyWjb@Vv&xP-r{q>UO0nKBNbjjBcarVV#iz
zU4ZF~r<TPvcL64g#P5u+?gC6_Jhd#YxeG8^Bz|Xn_5TMsABd`52a(tS0000<MNUMn
GLSTa6j`uSF

diff --git a/static/js/mmmm-image-tools/index.js b/static/js/mmmm-image-tools/index.js
new file mode 100644
index 0000000..acf40bc
--- /dev/null
+++ b/static/js/mmmm-image-tools/index.js
@@ -0,0 +1,196 @@
+function getLocalFilePath(path) {
+    if (path.indexOf('_www') === 0 || path.indexOf('_doc') === 0 || path.indexOf('_documents') === 0 || path.indexOf('_downloads') === 0) {
+        return path
+    }
+    if (path.indexOf('file://') === 0) {
+        return path
+    }
+    if (path.indexOf('/storage/emulated/0/') === 0) {
+        return path
+    }
+    if (path.indexOf('/') === 0) {
+        var localFilePath = plus.io.convertAbsoluteFileSystem(path)
+        if (localFilePath !== path) {
+            return localFilePath
+        } else {
+            path = path.substr(1)
+        }
+    }
+    return '_www/' + path
+}
+
+function dataUrlToBase64(str) {
+    var array = str.split(',')
+    return array[array.length - 1]
+}
+
+var index = 0
+function getNewFileId() {
+    return Date.now() + String(index++)
+}
+
+function biggerThan(v1, v2) {
+    var v1Array = v1.split('.')
+    var v2Array = v2.split('.')
+    var update = false
+    for (var index = 0; index < v2Array.length; index++) {
+        var diff = v1Array[index] - v2Array[index]
+        if (diff !== 0) {
+            update = diff > 0
+            break
+        }
+    }
+    return update
+}
+
+export function pathToBase64(path) {
+    return new Promise(function(resolve, reject) {
+        if (typeof window === 'object' && 'document' in window) {
+            if (typeof FileReader === 'function') {
+                var xhr = new XMLHttpRequest()
+                xhr.open('GET', path, true)
+                xhr.responseType = 'blob'
+                xhr.onload = function() {
+                    if (this.status === 200) {
+                        let fileReader = new FileReader()
+                        fileReader.onload = function(e) {
+                            resolve(e.target.result)
+                        }
+                        fileReader.onerror = reject
+                        fileReader.readAsDataURL(this.response)
+                    }
+                }
+                xhr.onerror = reject
+                xhr.send()
+                return
+            }
+            var canvas = document.createElement('canvas')
+            var c2x = canvas.getContext('2d')
+            var img = new Image
+            img.onload = function() {
+                canvas.width = img.width
+                canvas.height = img.height
+                c2x.drawImage(img, 0, 0)
+                resolve(canvas.toDataURL())
+                canvas.height = canvas.width = 0
+            }
+            img.onerror = reject
+            img.src = path
+            return
+        }
+        if (typeof plus === 'object') {
+            plus.io.resolveLocalFileSystemURL(getLocalFilePath(path), function(entry) {
+                entry.file(function(file) {
+                    var fileReader = new plus.io.FileReader()
+                    fileReader.onload = function(data) {
+                        resolve(data.target.result)
+                    }
+                    fileReader.onerror = function(error) {
+                        reject(error)
+                    }
+                    fileReader.readAsDataURL(file)
+                }, function(error) {
+                    reject(error)
+                })
+            }, function(error) {
+                reject(error)
+            })
+            return
+        }
+        if (typeof wx === 'object' && wx.canIUse('getFileSystemManager')) {
+            wx.getFileSystemManager().readFile({
+                filePath: path,
+                encoding: 'base64',
+                success: function(res) {
+                    resolve('data:image/png;base64,' + res.data)
+                },
+                fail: function(error) {
+                    reject(error)
+                }
+            })
+            return
+        }
+        reject(new Error('not support'))
+    })
+}
+
+export function base64ToPath(base64) {
+    return new Promise(function(resolve, reject) {
+        if (typeof window === 'object' && 'document' in window) {
+            base64 = base64.split(',')
+            var type = base64[0].match(/:(.*?);/)[1]
+            var str = atob(base64[1])
+            var n = str.length
+            var array = new Uint8Array(n)
+            while (n--) {
+                array[n] = str.charCodeAt(n)
+            }
+            return resolve((window.URL || window.webkitURL).createObjectURL(new Blob([array], { type: type })))
+        }
+        var extName = base64.split(',')[0].match(/data\:\S+\/(\S+);/)
+        if (extName) {
+            extName = extName[1]
+        } else {
+            reject(new Error('base64 error'))
+        }
+        var fileName = getNewFileId() + '.' + extName
+        if (typeof plus === 'object') {
+            var basePath = '_doc'
+            var dirPath = 'uniapp_temp'
+            var filePath = basePath + '/' + dirPath + '/' + fileName
+            if (!biggerThan(plus.os.name === 'Android' ? '1.9.9.80627' : '1.9.9.80472', plus.runtime.innerVersion)) {
+                plus.io.resolveLocalFileSystemURL(basePath, function(entry) {
+                    entry.getDirectory(dirPath, {
+                        create: true,
+                        exclusive: false,
+                    }, function(entry) {
+                        entry.getFile(fileName, {
+                            create: true,
+                            exclusive: false,
+                        }, function(entry) {
+                            entry.createWriter(function(writer) {
+                                writer.onwrite = function() {
+                                    resolve(filePath)
+                                }
+                                writer.onerror = reject
+                                writer.seek(0)
+                                writer.writeAsBinary(dataUrlToBase64(base64))
+                            }, reject)
+                        }, reject)
+                    }, reject)
+                }, reject)
+                return
+            }
+            var bitmap = new plus.nativeObj.Bitmap(fileName)
+            bitmap.loadBase64Data(base64, function() {
+                bitmap.save(filePath, {}, function() {
+                    bitmap.clear()
+                    resolve(filePath)
+                }, function(error) {
+                    bitmap.clear()
+                    reject(error)
+                })
+            }, function(error) {
+                bitmap.clear()
+                reject(error)
+            })
+            return
+        }
+        if (typeof wx === 'object' && wx.canIUse('getFileSystemManager')) {
+            var filePath = wx.env.USER_DATA_PATH + '/' + fileName
+            wx.getFileSystemManager().writeFile({
+                filePath: filePath,
+                data: dataUrlToBase64(base64),
+                encoding: 'base64',
+                success: function() {
+                    resolve(filePath)
+                },
+                fail: function(error) {
+                    reject(error)
+                }
+            })
+            return
+        }
+        reject(new Error('not support'))
+    })
+}
\ No newline at end of file
diff --git a/static/js/mmmm-image-tools/package.json b/static/js/mmmm-image-tools/package.json
new file mode 100644
index 0000000..e8b9c0a
--- /dev/null
+++ b/static/js/mmmm-image-tools/package.json
@@ -0,0 +1,11 @@
+{
+    "id": "mmmm-image-tools",
+    "name": "image-tools",
+    "version": "1.4.0",
+    "description": "图像转换工具，可用于图像和base64的转换",
+    "keywords": [
+        "base64",
+        "保存",
+        "图像"
+    ]
+}
\ No newline at end of file
diff --git a/static/js/request.js b/static/js/request.js
index 5da4c17..18894b6 100644
--- a/static/js/request.js
+++ b/static/js/request.js
@@ -2,8 +2,8 @@ import Vue from 'vue';
 import store from '@/store';
 
 // 定义 API URL
-const DEV_API_URL = 'https://tlgz.sz-trip.com';
-const PROD_API_URL = 'https://tlgz.sz-trip.com';
+const DEV_API_URL = 'https://cgc.js-dyyj.com';
+const PROD_API_URL = 'https://cgc.js-dyyj.com';
 const NEWAPIURL = process.env.NODE_ENV === 'development' ? DEV_API_URL : PROD_API_URL;
 
 // 获取token
diff --git a/subPackages/shiguang/index.vue b/subPackages/shiguang/index.vue
new file mode 100644
index 0000000..b59bbc5
--- /dev/null
+++ b/subPackages/shiguang/index.vue
@@ -0,0 +1,102 @@
+<template>
+	<view class="bg">
+		<image src="https://static.ticket.sz-trip.com/cgc/images/index/shiguang.png" mode="aspectFill" class="topImg"></image>
+		
+		<view class="box">
+			<view v-for="(item,index) in list" :key="index" class="item">
+				<view style="display: flex;align-items: center;">
+					<image :src="showImg(item.head_img)" mode="aspectFill" class="profile"></image>
+					<view class="name">君到苏州</view>
+				</view>
+				<view class="title">
+					视频标题视频标题视频标题视频标题视频标题视频标题视频标题视频标题视频标题
+				</view>
+				<view class="video-box" :style="{backgroundImage: 'url('+showImg(item.head_img)+')'}">
+					<image src="https://static.ticket.sz-trip.com/cgc/images/index/plays.png" mode="" class="play"></image>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [
+					{
+						head_img: 'https://static.ticket.sz-trip.com/uploads/20230920/7cdb05709d09cc2c86ea5671bd657c85.jpg'
+					},
+					{
+						head_img: 'https://changshu.js-dyyj.com/uploads/20250418/8a7631a1955ca05e619c0a25ad5ac1d1.jpg'
+					}
+				]
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bg {
+		min-height: 100vh;
+		background: #FFFFFF;
+		padding-bottom: 100rpx;
+	}
+	
+	.topImg {
+		width: 750rpx;
+		height: 380rpx;
+	}
+	
+	.box {
+		margin-top: -24rpx;
+		border-radius: 24rpx 24rpx 0 0;
+		padding: 0 32rpx;
+		
+		.item {
+			padding: 32rpx 0;
+			
+			.profile {
+				width: 48rpx;
+				height: 48rpx;
+				border-radius: 50%;
+				margin-right: 16rpx;
+			}
+			.name {
+				font-weight: 500;
+				font-size: 28rpx;
+				color: #000000;
+			}
+			
+			.title {
+				font-weight: 400;
+				font-size: 28rpx;
+				color: #000000;
+				margin-top: 24rpx;
+			}
+			
+			.video-box {
+				width: 686rpx;
+				height: 372rpx;
+				border-radius: 32rpx;
+				margin-top: 20rpx;
+				background-size: 100% 100%;
+				position: relative;
+				
+				.play {
+					position: absolute;
+					top: 0;
+					bottom: 0;
+					left: 0;
+					right: 0;
+					margin: auto;
+					width: 56rpx;
+					height: 56rpx;
+				}
+			}
+		}
+		.item:nth-child(n+2) {
+			border-top: 2rpx solid rgba(0,0,0,0.05);
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/subPackages/shiguang/shiguang.vue b/subPackages/shiguang/shiguang.vue
deleted file mode 100644
index 30cc112..0000000
--- a/subPackages/shiguang/shiguang.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<template>
-	<view class="bg">
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	
-</style>
\ No newline at end of file
diff --git a/subPackages/user/changeNickname.vue b/subPackages/user/changeNickname.vue
new file mode 100644
index 0000000..d35cfb4
--- /dev/null
+++ b/subPackages/user/changeNickname.vue
@@ -0,0 +1,89 @@
+<template>
+	<view class="bg">
+		<view class="nickname-box">
+			<input v-model="nickname" type="text" placeholder="请输入内容" />
+		</view>
+		<view class="btn" @click="save">保存</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "changeNickname",
+		data: function() {
+			return {
+				nickname: ""
+			}
+		},
+		methods: {
+			save: function() {
+				if (!this.nickname) {
+					uni.showToast({
+						title: '请输入昵称',
+						icon: 'none'
+					})
+					return;
+				}
+				this.Post({
+					nickname: this.nickname
+				}, '/api/user/profile').then(res => {
+					console.log(res)
+					if (res.code == 1) {
+						uni.showModal({
+							title: '提示',
+							content: '保存成功！',
+							success: res => {
+								if (res.confirm) {
+									this.goBack()
+								}
+							}
+						})
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.bg {
+		min-height: 100vh;
+		padding-top: 50rpx;
+	}
+
+	.nickname-box {
+		display: flex;
+		padding: 10rpx 0 30rpx;
+		margin: 0 30rpx;
+		align-items: center;
+		background: white;
+		margin-bottom: 100rpx;
+		font-size: 30rpx;
+		height: 70rpx;
+		border-bottom: 1rpx solid #D8D8D8;
+	}
+
+	.nickname-box span {
+		flex-shrink: 0;
+	}
+
+	.nickname-box input {
+		flex: 1;
+		font-size: 30rpx;
+		display: block;
+	}
+
+	.btn {
+		color: black;
+		margin: 0 auto;
+		line-height: 80rpx;
+		position: relative;
+		font-size: 34rpx;
+		text-align: center;
+		width: 333rpx;
+		height: 80rpx;
+		background: #C3282E;
+		border-radius: 40rpx;
+		color: #FFFFFF;
+	}
+</style>
\ No newline at end of file
diff --git a/subPackages/user/profile.vue b/subPackages/user/profile.vue
new file mode 100644
index 0000000..4419f2b
--- /dev/null
+++ b/subPackages/user/profile.vue
@@ -0,0 +1,407 @@
+<template>
+	<view v-if="info">
+		<view class="user-other-info">
+			<div class="info-avatar-top">
+				<span>头像</span>
+				<view @click="uploadImg()">
+					<image :src="showImg(info.avatar)" mode="aspectFill"
+						style="width: 80rpx;height: 80rpx;border-radius: 50%;"></image>
+				</view>
+			</div>
+			<navigator url="/subPackages/user/changeNickname" tag="view" class="userinfo-item">
+				<span>昵称</span>
+				<view>{{nickname}}</view>
+			</navigator>
+			<!-- <view class="userinfo-item" @click="showSexSelect = true">
+				<span>性别</span>
+				<view  @click="$refs.popup.open()">{{gender == 1 ? '男' : (gender == 2 ? '女' : '保密')}}</view>
+			</view> -->
+			<view class="userinfo-item">
+				<span>手机号</span>
+				<view>{{info.mobile}}</view>
+			</view>
+			<!-- <view class="userinfo-item">
+				<span>生日</span>
+				<picker mode="date" :value="date" :start="startDate" :end="endDate" @change="bindDateChange">
+					<view class="uni-input">{{birthday}}</view>
+				</picker>
+			</view>
+			<navigator url="/subPackages/user/logout" tag="view" class="userinfo-item">
+				<span>注销账号</span>
+				<i>注销后账号无法恢复，请谨慎操作</i>
+			</navigator> -->
+			<!-- <view class="btn-tao" @click="submit">保存</view> -->
+		</view>
+		
+		<!-- 性别弹框 -->
+		<uni-popup ref="popup" type="bottom">
+			<view class="popup-box">
+				<view class="popup-item flex-center" v-for="(item,index) in sexes" :key="index" @click="changesex(index)">{{item.text}}</view>
+				<view class="popup-items flex-center" @click="$refs.popup.close()">取消</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {pathToBase64} from  "@/static/js/mmmm-image-tools/index.js"
+	export default {
+		name: "Profile",
+		data() {
+			const currentDate = this.getDate({
+				format: true
+			})
+			return {
+				date: currentDate,
+				info: null,
+				showSexSelect: false,
+				sexes: [{
+						value: '1',
+						text: '男'
+					},
+					{
+						value: '2',
+						text: '女'
+					},
+					{
+						value: '0',
+						text: '保密'
+					}
+				],
+				today: null,
+				showCropper: false,
+				nickname: '',
+				gender: '',
+				birthday: '',
+				email: '',
+				fileList1: [],
+				startDate: '1900-1-1',
+				endDate: '2050-1-1'
+			}
+		},
+		onShow() {
+			console.log(this.$store.state.user.userInfo,uni.getStorageSync('userInfo'))
+			this.getList()
+		},
+		computed: {
+			// startDate() {
+			// 	return this.getDate('start');
+			// },
+			// endDate() {
+			// 	return this.getDate('end');
+			// }
+		},
+		methods: {
+			getFile(e) {
+				console.log(e)
+			},
+			getList() {
+				let today = new Date();
+				today = today.getFullYear() + "/" + (today.getMonth() + 1) + "/" + today.getDate();
+				this.today = today;
+				this.Post({}, "/api/user/userInfo").then(res => {
+					if (!res.data.birthday) {
+						let date = new Date();
+						res.data.birthday = date.getFullYear() + "/" + (date.getMonth() + 1) + "/" + date
+							.getDate();
+					}
+					this.info = res.data;
+					this.nickname = this.info.nickname
+					this.email = this.info.email
+					this.birthday = this.info.birthday
+					this.gender = this.info.gender
+					this.info.token = JSON.parse(uni.getStorageSync('userInfo')).token || this.$store.state.user.userInfo.token
+					console.log(this.info)
+					this.$store.commit('changeUserInfo', this.info)
+				})
+			},
+			uploadImg() {
+				uni.chooseImage({
+					success: (chooseImageRes) => {
+						const tempFilePaths = chooseImageRes.tempFilePaths;
+						// // #ifdef MP-WEIXIN
+						// uni.getFileSystemManager().readFile({
+						// 	filePath: tempFilePaths[0],
+						// 	encoding: 'base64',
+						// 	success: res => {
+						// 		this.Post({
+						// 			method: 'POST',
+						// 			base64: 'data:image/png;base64,' + res.data
+						// 		}, '/api/common/base64').then(res => {
+						// 			if (res.data) {
+						// 				this.Post({
+						// 					avatar: res.data
+						// 				}, '/api/user/profile').then(res => {
+						// 					uni.showModal({
+						// 						title: '提示',
+						// 						content: res.msg,
+						// 						showCancel: false,
+						// 						success: res => {
+						// 							if (res.confirm) {
+						// 								this.getList()
+						// 							}
+						// 						}
+						// 					})
+						// 				})
+						// 			}
+						// 		})
+						// 	}
+						// })
+						// // #endif
+						
+						pathToBase64(tempFilePaths[0]).then(base64 => {
+							this.Post({
+								method: 'POST',
+								base64: base64
+							}, '/api/common/base64').then(res => {
+								if (res.data) {
+									this.Post({
+										avatar: res.data
+									}, '/api/user/profile').then(res => {
+										uni.showModal({
+											title: '提示',
+											content: res.msg,
+											showCancel: false,
+											success: res => {
+												if (res.confirm) {
+													this.getList()
+												}
+											}
+										})
+									})
+								}
+							})
+						})
+					}
+				});
+			},
+			//生日
+			bindDateChange: function(e) {
+				this.birthday = e.detail.value
+			},
+			getDate(type) {
+				const date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				let day = date.getDate();
+
+				if (type === 'start') {
+					year = year - 60;
+				} else if (type === 'end') {
+					year = year + 2;
+				}
+				month = month > 9 ? month : '0' + month;
+				day = day > 9 ? day : '0' + day;
+				return `${year}/${month}/${day}`;
+			},
+			changesex(index) {
+				this.gender = this.sexes[index].value
+				this.$refs.popup.close()
+			},
+			submit() {
+				uni.showModal({
+					title: '提示',
+					content: '确认修改您的信息？',
+					success: res => {
+						if (res.confirm) {
+							this.Post({
+								nickname: this.nickname,
+								gender: this.gender,
+								birthday: this.birthday
+							}, '/api/user/profile').then(res => {
+								console.log(res)
+								if (res.code == 1) {
+									uni.showModal({
+										title: '提示',
+										content: res.msg,
+										showCancel: false,
+										success: res => {
+											if (res.confirm) {
+												this.getList()
+											}
+										}
+									})
+								}
+							})
+						}
+					}
+				})
+			},
+
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	view {
+		box-sizing: content-box;
+	}
+	.info-avatar-top {
+		display: flex;
+		justify-content: space-between;
+		font-size: 30rpx;
+		border-bottom: 1rpx solid #D8D8D8;
+		padding: 40rpx 0;
+		height: 48rpx;
+		color: #333;
+		align-items: center;
+	}
+	.info-avatar-top view{
+		display: flex;
+		align-items: center;
+	}
+	.info-avatar-top view:after{
+		content: "";
+		width: 20rpx;
+		height: 20rpx;
+		margin-left: 6rpx;
+		background-image: url('https://static.ticket.sz-trip.com/tongli/images/user/rightIcon-gray.png');
+		background-size: 100% 100%;
+	}
+	.info-avatar-top img {
+		width: 80rpx;
+		height: 80rpx;
+		border-radius: 50%;
+		margin-right: 10rpx;
+	}
+
+	.change-avatar-btn {
+		color: #FFF;
+		width: 220rpx;
+		margin: 0 auto;
+		line-height: 70rpx;
+		border-radius: 20rpx;
+		background: #4C93FF;
+		position: relative;
+		font-size: 34rpx;
+	}
+
+	.change-avatar-btn input {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		opacity: 0;
+	}
+
+	.user-other-info {
+		margin: 30rpx;
+	}
+
+	.userinfo-item {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 30rpx;
+		border-bottom: 1rpx solid #D8D8D8;
+		padding: 40rpx 30rpx 40rpx 0;
+		height: 48rpx;
+		color: #333;
+		position: relative;
+	}
+
+	.info-avatar-top span {
+		font-weight: 500;
+		font-size: 31rpx;
+		flex-shrink: 0;
+	}
+
+	.userinfo-item span {
+		font-weight: 500;
+		font-size: 31rpx;
+		flex-shrink: 0;
+		color: #000;
+	}
+	
+	.userinfo-item i {
+		font-weight: 500;
+		font-size: 24rpx;
+		color: #999999;
+	}
+
+	.userinfo-item {
+		& view::after {
+			content: "";
+			width: 20rpx;
+			height: 20rpx;
+			margin-left: 6rpx;
+			background-image: url('https://static.ticket.sz-trip.com/tongli/images/user/rightIcon-gray.png');
+			background-size: 100% 100%;
+			position: absolute;
+			right: 0;
+			margin: auto;
+			top: 0;
+			bottom: 0;
+		}
+	}
+
+	.birthday-box {
+		text-align: right;
+	}
+
+	.cropper {
+		width: auto;
+		height: 100%;
+	}
+
+	.cropper-content {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		z-index: 1000;
+	}
+
+	.dialog-footer .change-avatar-btn {
+		position: fixed;
+		text-align: center;
+		bottom: 80rpx;
+		left: 50%;
+		margin-left: -110rpx;
+	}
+
+	.btn-tao {
+		text-align: center;
+		font-size: 30rpx;
+		width: 697rpx;
+		height: 80rpx;
+		background: #C3282E;
+		border-radius: 40rpx;
+		line-height: 80rpx;
+		color: #FFFFFF;
+		position: fixed;
+		left: 26rpx;
+		bottom: 100rpx;
+	}
+	
+	.popup-box {
+		border-radius: 20rpx 20rpx 0rpx 0rpx;
+		background: #fff;
+		overflow: hidden;
+		
+		.popup-item {
+			width: 697rpx;
+			height: 99rpx;
+			font-weight: 500;
+			font-size: 31rpx;
+			color: #12293C;
+			margin: auto;
+		}
+		.popup-item:nth-child(2) {
+			border: none;
+			border-bottom: 1rpx solid #D8D8D8;
+			border-top: 1rpx solid #D8D8D8;
+		}
+		
+		.popup-items {
+			width: 100%;
+			height: 99rpx;
+			font-weight: 500;
+			font-size: 31rpx;
+			color: #12293C;
+			border-top: 13rpx solid #F2F2F2;
+		}
+	}
+</style>