From 8e1f5fa6582579e7a15c7aa769fb90ab13e1f3c5 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 15 Jun 2022 17:18:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
apis/modules/user.js | 4 +-
manifest.json | 3 +-
{pages => order}/addCourse/addCourse.vue | 0
{pages => order}/editCourse/editCourse.vue | 0
{pages => order}/orderDetail/orderDetail.vue | 4 +-
{pages => order}/ordered/ordered.vue | 0
{pages => order}/orders/orders.vue | 0
pages.json | 91 +++++++++++--------
pages/clientDetail/clientDetail.vue | 4 +-
pages/index/index.vue | 2 +-
pages/phone/phone.vue | 2 +-
static/image/person4.png | Bin 724 -> 1406 bytes
12 files changed, 60 insertions(+), 50 deletions(-)
rename {pages => order}/addCourse/addCourse.vue (100%)
rename {pages => order}/editCourse/editCourse.vue (100%)
rename {pages => order}/orderDetail/orderDetail.vue (99%)
rename {pages => order}/ordered/ordered.vue (100%)
rename {pages => order}/orders/orders.vue (100%)
diff --git a/apis/modules/user.js b/apis/modules/user.js
index 4c94db6..7af8fc2 100644
--- a/apis/modules/user.js
+++ b/apis/modules/user.js
@@ -37,8 +37,8 @@ export const changeAccount = account => {
return post(`users/applets/mine/changeAccount?account=${account}`)
}
-export const changePhoneNumber = phone => {
- return post(`users/applets/mine/changePhoneNumber?phone=${phone}`)
+export const changePhoneNumber = (phone, code) => {
+ return post(`users/applets/mine/changePhoneNumber?phone=${phone}&code=${code}`)
}
export const checkIfAnAccountExists = account => {
diff --git a/manifest.json b/manifest.json
index b17d47a..344437a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
{
- "name" : "crm-pro",
+ "name" : "或然crm",
"appid" : "__UNI__2E89BA6",
"description" : "",
"versionName" : "1.0.0",
@@ -48,7 +48,6 @@
"quickapp" : {},
/* 快应用特有相关 */
"mp-weixin" : {
- /* 小程序特有相关 */
"appid" : "wx77a8a2a23138998b",
"setting" : {
"urlCheck" : false,
diff --git a/pages/addCourse/addCourse.vue b/order/addCourse/addCourse.vue
similarity index 100%
rename from pages/addCourse/addCourse.vue
rename to order/addCourse/addCourse.vue
diff --git a/pages/editCourse/editCourse.vue b/order/editCourse/editCourse.vue
similarity index 100%
rename from pages/editCourse/editCourse.vue
rename to order/editCourse/editCourse.vue
diff --git a/pages/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue
similarity index 99%
rename from pages/orderDetail/orderDetail.vue
rename to order/orderDetail/orderDetail.vue
index 69ce43b..b23f89e 100644
--- a/pages/orderDetail/orderDetail.vue
+++ b/order/orderDetail/orderDetail.vue
@@ -382,14 +382,14 @@
update(data).then(res => {
this.$util.sucMsg('编辑成功')
setTimeout(() => {
- this.$util.to('../orders/orders')
+ uni.navigateBack()
}, 1500)
}).catch(res => {})
} else {
add(data).then(res => {
this.$util.sucMsg('添加成功')
setTimeout(() => {
- this.$util.to('../orders/orders')
+ uni.navigateBack()
}, 1500)
}).catch(res => {})
}
diff --git a/pages/ordered/ordered.vue b/order/ordered/ordered.vue
similarity index 100%
rename from pages/ordered/ordered.vue
rename to order/ordered/ordered.vue
diff --git a/pages/orders/orders.vue b/order/orders/orders.vue
similarity index 100%
rename from pages/orders/orders.vue
rename to order/orders/orders.vue
diff --git a/pages.json b/pages.json
index a1fe601..bc7eeda 100644
--- a/pages.json
+++ b/pages.json
@@ -23,14 +23,6 @@
"navigationBarTitleText": "邀请加入",
"enablePullDownRefresh": false
}
- },
- {
- "path" : "pages/orders/orders",
- "style" :
- {
- "navigationBarTitleText": "订单列表",
- "enablePullDownRefresh": true
- }
},
{
"path" : "pages/clients/clients",
@@ -47,14 +39,6 @@
"navigationBarTitleText": "产品",
"enablePullDownRefresh": true
}
- },
- {
- "path" : "pages/addCourse/addCourse",
- "style" :
- {
- "navigationBarTitleText": "选择产品",
- "enablePullDownRefresh": true
- }
},
{
"path" : "pages/clientDetail/clientDetail",
@@ -64,14 +48,6 @@
"enablePullDownRefresh": false
}
},
- {
- "path" : "pages/orderDetail/orderDetail",
- "style" :
- {
- "navigationBarTitleText": "订单详情",
- "enablePullDownRefresh": false
- }
- },
{
"path" : "pages/addStaff/addStaff",
"style" :
@@ -128,22 +104,6 @@
"enablePullDownRefresh": true
}
},
- {
- "path" : "pages/ordered/ordered",
- "style" :
- {
- "navigationBarTitleText": "已订阅产品",
- "enablePullDownRefresh": false
- }
- },
- {
- "path" : "pages/editCourse/editCourse",
- "style" :
- {
- "navigationBarTitleText": "编辑产品",
- "enablePullDownRefresh": false
- }
- },
{
"path" : "pages/account/account",
"style" :
@@ -169,6 +129,57 @@
}
}
],
+ "subPackages": [{
+ "root": "order",
+ "pages": [
+ {
+ "path": "orders/orders",
+ "style" :
+ {
+ "navigationBarTitleText": "订单列表",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path" : "addCourse/addCourse",
+ "style" :
+ {
+ "navigationBarTitleText": "选择产品",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path" : "orderDetail/orderDetail",
+ "style" :
+ {
+ "navigationBarTitleText": "订单详情",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path" : "ordered/ordered",
+ "style" :
+ {
+ "navigationBarTitleText": "已订阅产品",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path" : "editCourse/editCourse",
+ "style" :
+ {
+ "navigationBarTitleText": "编辑产品",
+ "enablePullDownRefresh": false
+ }
+ }
+ ]
+ }],
+ "preloadRule": {
+ "order/orders/orders": {
+ "network": "all",
+ "packages": ["__APP__"]
+ }
+ },
"condition": { //模式配置，仅开发期间生效
"current": 0, //当前激活的模式（list 的索引项）
"list": [{
diff --git a/pages/clientDetail/clientDetail.vue b/pages/clientDetail/clientDetail.vue
index 82c52b6..1459c21 100644
--- a/pages/clientDetail/clientDetail.vue
+++ b/pages/clientDetail/clientDetail.vue
@@ -75,11 +75,11 @@
<uni-icons class="icon" custom-prefix="iconfont" type="icon-edit" size="20" color="#959595"></uni-icons>
<view class="text">编辑</view>
</view>
- <view class="item" @click="toPage(`../ordered/ordered?customerId=${customerId}`)">
+ <view class="item" @click="toPage(`/order/ordered/ordered?customerId=${customerId}`)">
<uni-icons class="icon" custom-prefix="iconfont" type="icon-product" size="20" color="#959595"></uni-icons>
<view class="text">已订阅产品</view>
</view>
- <view class="item" @click="toPage('../orders/orders')">
+ <view class="item" @click="toPage('/order/orders/orders')">
<uni-icons class="icon" custom-prefix="iconfont" type="icon-dingdan" size="20" color="#959595"></uni-icons>
<view class="text">订单</view>
</view>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 61b29db..8f6f7dd 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -22,7 +22,7 @@
<image class="icon" src="@/static/image/index/index4.png" mode="widthFix"></image>
<view class="text">方案</view>
</li>
- <li v-if="auth('首页:订单')" @click="$util.to('../orders/orders')">
+ <li v-if="auth('首页:订单')" @click="$util.to('/order/orders/orders')">
<image class="icon" src="@/static/image/index/index5.png" mode="widthFix"></image>
<view class="text">订单</view>
</li>
diff --git a/pages/phone/phone.vue b/pages/phone/phone.vue
index 96914e8..23f6390 100644
--- a/pages/phone/phone.vue
+++ b/pages/phone/phone.vue
@@ -72,7 +72,7 @@
const { phone, code } = this.form
if (!phone) return this.$util.errMsg('请输入手机号')
if (!code) return this.$util.errMsg('请输入验证码')
- changePhoneNumber(phone).then(res => {
+ changePhoneNumber(phone, code).then(res => {
this.$util.sucMsg('修改成功！')
setTimeout(() => {
uni.reLaunch({
diff --git a/static/image/person4.png b/static/image/person4.png
index 35bbd6ef45072b6d15aab80450d4bc982e546bce..84b1d5483839cd815d0cdd1da928e6f663bcf18a 100644
GIT binary patch
delta 1398
zcmV-+1&R991^x<<8Gi-<00374`G)`i00DDSM?wIu&K&6g00lTnL_t(&L+zSth*eb-
z$A4=^Q|Lnq={ONRwHHy86PY1dSz%;N8uWlbGcqcW(w;hV_P*m-7Nr>$O6q(G!xEb$
zdkKY@R+f}jk`iU~)G`qw9jCiu-#g>XoU_ll=gvKszPRBsaDUF;|FwQ+?X&mV>x@v1
zHb+loAPZ0?7376=9N|$~Wlz@TBx}Kfp3#jc<3ie-uoAvjvH9!)j1EEh%j=mi6e9;J
z_PUqAF@VU^JQjiSCfKnlRPhutdK^YN%6slTz55>lqvJ91VZ{J}et@!woV51`qI`hG
zI*316j_`730DmwZ;U$!(u<~O$AmsrBItEw+oP=;?rU1@s<$GWOIa!((B0WH}8ie4e
za5VsWynYocx2J(f2N38w;D$be)dg^-=3`|}DTvYlfxZAd5D}_AfJ*{rU}RYmL^43L
z&O}%glh<VR4y*!hi*-`Do}9cLcRwD$=meB^fZE7l<$pVBXvD}@6)&U3>~$VW+;rJP
zo=LRG4j)83K%k!jmv{#4N4Oay8@*4ZzqwGL7XV+zM0+_#?oJO7=;W^DGCD?SOx$$(
z3s8*2X<bXH&)0ES*%ZFvkATtFQKooa+*XXtO<Wl&0VqODMOo>wu?j19lm-a20odvh
z*vdh!V1J?fQ&j*b9;gGD>alYjR^ID<JsN>Pp93EBytv6zr+Yx95pX)qIuT*L$A@-u
z(ijim@|^wbL8%K3-iDRYiBCRDfMOJO10y}txDF$GyRY|+K#Pu|lU<%cvoPW!ldffP
zs1I}j@JPg9Ee$lw=Y9aISCeN$WY7^tFkgO8=YKtrMOmeoIBxMwqsioCZ5+Tf@~j9A
zI*64MQahhjN24Q9e)Y_TnHX8@2QZpLX$lSc0V}6x<yTocfw~oMaA?f4Sefky2=o;o
zyw;|Ffy?qPMdv_w0_TK!uExr(aRBcF6G8(vW99M`=Cbb+=tscVknjeqToX5iqC2p%
zn}3{~mA!W<6q|Jy!l*tyg*6ztB`yNXfxAM|2e2|Ug}Lmz1nNqZLqftUurfUkz`qL%
z!!Ytk_8ulEwrU+6{O0Mg5GxP)0mA3ro?g>25?)@b%VTsl$}<roiX|t;5746L(#ba-
z&)&q!P1W@{q#memL2<{-i!kzqAHZET`hPLXr4eWIG|<wsg;y1(Nk>z|XC52dv2tPW
z>(Ok~=v<T*&){WPnNd~8yTt=_b)kDaw&r1_&qnJ5xR^Yf5eEG)QHXo`%3*34i;-=~
z5pZ_{eG+&q0w8=1G+^XVRU)xe2l5N<z%t&W@5+vkhp+pOl=F2MhuDH}rWeA<`F~Xb
zaD`r<^R5aqn9F!V_N4<TzRdTbEQxV+E5fyzeeY`3dOC0i_A|Wpg!?h_qVHaEVJpzr
zfTP=X9|6Ig5AMat8x=*v>J;+03?MFLUxJlrWw6U=n$qIWg=%zsTfqRHrb)gn3#3KQ
zrn7M33a2hTGQv)boR_3q8X)eN*?(8nr5UTKVLgGol?dWKj3_q(cLFCS_7&<e;!7uv
z4l4~%d>=;QveGn7*@qO$GJ6q<FP$<B7+%;#mHIR?)G~%<`J`0ebO1$&;V5mu#8RRa
z-rvpu8fg;uv7=;558$MVWtZm*MJM%abS2FtbPx^$Z5+=m9+tn;N|guDt#9g*zJHm9
z7OH1%dQ{Tflxw4wl{ASvLYCF~2heRI(388CS@&NlSCwU1abJDjMQF#$Pi2km)wwc&
z-c}uq;L3h(**m51)52eu0=qAd#b2Hs)UdYH>XH`dKQ!n4K$bIBHvj+t07*qoM6N<$
Ef}U)S@Bjb+
literal 724
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sEdf3uu0Wch;Xgw?7&ZO}v4N-#
z%!M$3Y&aL93_?O=;fmpc5C%jSL?f~kP(6^_2DSyrr~z?vOTr|8&d@Fi@(X5gynRFR
z+}_U%+Zrl!6L`AZo;@rL@iE=L;q9trGb6l{ZM4&_9O=&&WuLEnuuR}00|Vm~PZ!4!
zkK;?Hy`9#iAkcRINWkSwcYJi;X78W=d;k8_yFzUnzs#8@FV|AZn%3r6;1{UjD!?J>
zrrtAY>CR0jF29-hRcog9F`LLl3HxtX6yo0S-<0pMoG!EDZ=mgy7q|AW5R6;#H>h{h
zmbd9yOvcIkLnq((_D>{d&AM+f3VHW>e?}O;X!{`*pI@<;`QeZL%0<h#LN0M;{L}e!
zgyYqgC6%ncj=Ss_D$E_%&bKy-VaRyXCpPPk+Jpj8-iED4OD^b~nKW(P<?ALV^5f_3
z6)e%d6OixXw<~7FbhBNF#|@k^;+jMY)~$TtYaZn-;52JG*MZ%l?R8zZZg_Ca`jj2M
z;j*r_1QX-UL(5<7fBk=Z+|~!TqqgZ<%y7BC{rTOqOdh$73W<LL^(vpgluOM2mGmv)
zMsVYnySo?yHXin8T`0R_r=)R;$$aHGFBX2CYwCJ#qCMkI)A_S4SGA}u(es%5(|p?f
zxbqA~>T`|1yZo%(6q^3sB`wdr)81?%&z{&jy^B=jQ(PDPVtP7Pym4yz{x-2mQzhe0
zocfmacjp>5ZpoVSXXhVXnh|{R)r|Y`c3DE~MSpvWQ^YTP4i_lD_r*Jd?O50ybMf2i
t`rlse=bN)gQ9a|Xh(u~yT|L{jU)<-;{e0_MZl4NDo}R9LF6*2UngA*lQ9=L!