From 6306573ee4bbe72f7f576b3e0615abe4219c6397 Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Mon, 24 Aug 2020 14:29:15 +0800 Subject: [PATCH 01/15] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E4=BA=BA=E4=BC=98=E6=83=A0=E5=88=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/mine/coupon/index.vue | 4 ++-- components/mine/coupon/mine.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/components/mine/coupon/index.vue b/components/mine/coupon/index.vue index f9648e3..0020c37 100644 --- a/components/mine/coupon/index.vue +++ b/components/mine/coupon/index.vue @@ -2,8 +2,8 @@ -
- {{ couponInfo.type == 2 ? '店铺优惠券' : '平台优惠券' }} +
{{ couponInfo.vouchertemplate_id == 1 ? '新人专享' : '平台优惠券' }}
+
店铺优惠券
 diff --git a/components/mine/coupon/mine.vue b/components/mine/coupon/mine.vue index a41172a..1fda7c3 100644 --- a/components/mine/coupon/mine.vue +++ b/components/mine/coupon/mine.vue @@ -2,8 +2,8 @@ -
- {{ couponInfo.type == 2 ? '店铺优惠券' : '平台优惠券' }} +
{{ couponInfo.vouchertemplate_id == 1 ? '新人专享' : '平台优惠券' }}
+
店铺优惠券
 From 0a5115b8f4dc8bb70afa3ef61a3fa96ec91cd01d Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Mon, 24 Aug 2020 15:13:38 +0800 Subject: [PATCH 02/15] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AE=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pageD/activity/activity.vue | 10 ++++---- pageD/logistics/logistics.vue | 44 ++++++++++++++++++++++++++++------- pageD/notice/notice.vue | 4 ++++ 3 files changed, 45 insertions(+), 13 deletions(-) diff --git a/pageD/activity/activity.vue b/pageD/activity/activity.vue index 0ad1ed7..65645d3 100644 --- a/pageD/activity/activity.vue +++ b/pageD/activity/activity.vue @@ -15,6 +15,7 @@ + @@ -23,9 +24,8 @@ data() { return { height:'600', - actives: [ - - ] + actives: [], + loadStatus: 'loadmore' }; }, onLoad(){ @@ -45,7 +45,9 @@ messageactivityList(){ this.$u.api.messageactivityList({}).then((res)=>{ if (res.errCode == 0) { - this.actives = res.data; + this.actives = res.data; + // 目前没有分页,只无数据提示用,他们建议这样做 + if(!this.actives.length) this.loadStatus = 'nomore'; } }) } diff --git a/pageD/logistics/logistics.vue b/pageD/logistics/logistics.vue index 7eabb61..3ce9c8e 100644 --- a/pageD/logistics/logistics.vue +++ b/pageD/logistics/logistics.vue @@ -18,6 +18,7 @@ + @@ -26,20 +27,45 @@ data() { return { actives: [], - page: 1 + page: 1, + timer: true, + loadStatus: 'loadmore' }; }, onLoad() { this.getCartList(); - }, + }, + onReachBottom() { + this.loadmore(); + }, methods: { - getCartList() { - this.$u.post("message/orderDeliveryList",{page: this.page}).then(res => { - console.log(res.data.data) - if (res.errCode == 0) { - this.actives = res.data.data; - } - }) + loadmore() { + if(!this.timer) return false; + this.loadStatus = "loading"; + this.page++; + this.getCartList({ load: 'loadmore' }).then(length => { + if(length == 0) { + this.page--; + this.loadStatus = 'nomore'; + } else { + this.loadStatus = 'loading'; + } + }).catch(() => { + this.loadStatus = "nomore"; + this.page--; + }) + }, + async getCartList({ load = 'reload' } = {}) { + const res = await this.$u.post("message/orderDeliveryList",{ page: this.page }) + this.timer = true; + if (res.errCode == 0) { + if(load == 'reload') { + this.actives = res.data.data; + if(res.data.data.length < 12) this.loadStatus = "nomore"; + } + else if(load == 'loadmore') this.actives.push(...res.data.data); + } + return res.data.data.length; }, viewLogistics(item) { let url; diff --git a/pageD/notice/notice.vue b/pageD/notice/notice.vue index 4c7d154..d4eaed5 100644 --- a/pageD/notice/notice.vue +++ b/pageD/notice/notice.vue @@ -2,6 +2,7 @@ + @@ -11,6 +12,7 @@ data() { return { list: [], + loadStatus: 'loadmore' }; }, onLoad() { @@ -29,6 +31,8 @@ this.$u.api.informationList({}).then((res) => { if (res.errCode == 0) { this.list = res.data; + // 目前没有分页,只无数据提示用 + if(!this.list.length) this.loadStatus = 'nomore'; } }) } From e674a2c0df1fa19412ca9302599ad3acb246af64 Mon Sep 17 00:00:00 2001 From: Gdpao <1341331954@qq.com> Date: Mon, 24 Aug 2020 15:45:35 +0800 Subject: [PATCH 03/15] gdpao --- pageB/video/video.nvue | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pageB/video/video.nvue b/pageB/video/video.nvue index e11d412..f2b4a88 100644 --- a/pageB/video/video.nvue +++ b/pageB/video/video.nvue @@ -71,12 +71,11 @@ {{ child.content }} - + {{ child_end[item.id] ? "暂无更多回复" : "展开更多回复" }} - - + @@ -678,14 +677,17 @@ } .child_content { - padding: 4rpx 0; + width: 550rpx; + padding-top: 6rpx; margin-left: 40rpx; font-size: 26rpx; } .more-comment { - margin: 10rpx 0; + width: 150rpx; + height: 40rpx; font-size: 22rpx; + line-height: 4; color: #999; } From 5c47aa8e5cc51d8f449fe6ffabe73261aff85c74 Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Mon, 24 Aug 2020 16:40:38 +0800 Subject: [PATCH 04/15] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=92=AD=E6=94=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pageB/playVideo/index.nvue | 44 +++++++++++++++++++++++++++++++++++++ pages.json | 7 ++++++ static/image/clons.png | Bin 0 -> 1398 bytes 3 files changed, 51 insertions(+) create mode 100644 pageB/playVideo/index.nvue create mode 100644 static/image/clons.png diff --git a/pageB/playVideo/index.nvue b/pageB/playVideo/index.nvue new file mode 100644 index 0000000..c848c29 --- /dev/null +++ b/pageB/playVideo/index.nvue @@ -0,0 +1,44 @@ + + + \ No newline at end of file diff --git a/pages.json b/pages.json index d1616ea..34c3edc 100644 --- a/pages.json +++ b/pages.json @@ -79,6 +79,13 @@ { "root": "pageB", "pages": [ + { + "path": "playVideo/index", + "style": { + "navigationStyle":"custom", + "backgroundColor":"#000000" + } + }, { "path": "follow/index", "style": { diff --git a/static/image/clons.png b/static/image/clons.png new file mode 100644 index 0000000000000000000000000000000000000000..38c94e2ec7c90292125e61c2ce6f16d5f574084e GIT binary patch literal 1398 zcmV-+1&R8JP)$y000F&Nkl1uRDxgsVifG&wcNEuX)VRbQR7||oc;S_I-uN?22!Fr}6E6)0_bu)Vins(s z1Ozn%5SL)$ZY=W-Ur%~^>YT3XQ`OUUaxP}3r%yliezm>dSI&EX6mTMN3vdl^9Pk71 z8SnwH**W(U|AWhWzX-SxxEfdv9BVA^0=ocnXg z%-;KX!09I1wFbTr_z`#;SUbhxy_c%z0}lXK0`q}C06~8aJPW)9Y;(^2Jw#~l{b9h_ z!1cggz{P;nRwGEL_kqWOEdss?xCD3@IHv)m)_Dhb33wgYIW(nB*)srf++K^)I?5Jc z4e+UeFS2-l1h^ug;C|p^U>)%0kd&?|djoI}a5=Cz!0;ikTH}&{HAtz2?gv&{e^!Xp zFAZW+`sJZ0-B9*6Q&ueXOI`3A;5p#QsR*@JI?`H4z$<`rhpcphvRi@Y?V~9D)m32L z`(rGm?*ncfs?v$dz5+Z2Y;evU5bHFselTc_)OT8V4@&7oWfjIR03TJbvw#iyXq%n} zrF2JS1^Y|Ad(Kd}5#EDQI)}0qTM&3iO6O9x6?h1JI;XNxz;mf|Ze^o^=R)Zc$|eE# zsdOo2lY#qCx}>t5fJ-V}TG`IPC6w+%*@=L2D&3c|69eZ^x=&@Z0C!OOMc@tKTYG_1 zfg6E4TK2Qmu4mTTIIxW!`>T;l%ajKt?6Ty7J_CGW&%YG7+g!$wQ=$EAaMzRaeyy8_ zE)VnG$LzB9niIOozGE36hw+5QcUDeCHf6Jgbp1sml=gr;vdZU{vnXYok(OQABEW$@ zeKT+huplyOeh0oY(_Bu)#C^8;y;=Hj^Px4RH5kb~xgZkw3v($nxXo}XBLBbjwj#i$ z^bx>S=7uVbv&2mP&`Zhq-v_*E?&5mq+;6RK-{FR0zy_^wmS3!qSf00XJ)uj6{{|bu z*E#1D)9N3lE8B@9U@4a26&nhm}5de8kau(${j;SX8rvX?Ag zDq!gTgk6?Ww5o{zO2D#EWwt#EoY#1;oQhr6Iz@6llY%!!Z$+ubp{8^4CGZ%qu?=_- zeYUMpB9xv1EW=zO{h;N7G+O@!{A^Y5PnXEzwLzr*y{7cNHV)}T%i(rlMW*2sRY+^Z zJKkvU_Tcn-s2w^JhsGmuX`L+&S;Pna1MFjX)H5P`6aWAK07*qoM6N<$ Ef=#}s{{R30 literal 0 HcmV?d00001 From 6a25fe34a746128ef9d95ed7e66939f44861a88e Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Mon, 24 Aug 2020 17:01:34 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=A7=86=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/remaining/remaining.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/remaining/remaining.vue b/components/remaining/remaining.vue index 1519ea0..87e6cfb 100644 --- a/components/remaining/remaining.vue +++ b/components/remaining/remaining.vue @@ -50,7 +50,7 @@ data() { return { remaining: 7, - type: true, + type: false, banner: false, protocol: false, heightOut: '', @@ -121,13 +121,13 @@ if (this.remaining <= 0) { clearInterval(this.timer); console.log("完了") - this.type = !this.type; + // this.type = !this.type; this.banner = !this.banner; } }, 1000); }, leap_over() { - this.type = !this.type + // this.type = !this.type this.banner = !this.banner; clearInterval(this.timer) // 获取屏幕高度 From 6d4d2e5d8df6987a3f6757f8a25ef1f7f31c332f Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Tue, 25 Aug 2020 10:01:39 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=BA=86=E8=A7=86?= =?UTF-8?q?=E9=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/remaining/remaining.vue | 20 ++++++++++---------- pages.json | 1 + 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/components/remaining/remaining.vue b/components/remaining/remaining.vue index 87e6cfb..5c7cdf5 100644 --- a/components/remaining/remaining.vue +++ b/components/remaining/remaining.vue @@ -51,7 +51,7 @@ return { remaining: 7, type: false, - banner: false, + banner: true, protocol: false, heightOut: '', imgurl: [], @@ -116,15 +116,15 @@ }, // 3秒倒计时 remaining_time() { - this.timer = setInterval(() => { - this.remaining--; - if (this.remaining <= 0) { - clearInterval(this.timer); - console.log("完了") - // this.type = !this.type; - this.banner = !this.banner; - } - }, 1000); + // this.timer = setInterval(() => { + // this.remaining--; + // if (this.remaining <= 0) { + // clearInterval(this.timer); + // console.log("完了") + // // this.type = !this.type; + // // this.banner = !this.banner; + // } + // }, 1000); }, leap_over() { // this.type = !this.type diff --git a/pages.json b/pages.json index 34c3edc..c4f4f6b 100644 --- a/pages.json +++ b/pages.json @@ -56,6 +56,7 @@ "style": { "navigationBarTitleText": "", "navigationStyle": "custom", + "backgroundColorBottom":"#000000", "app-plus": { "titleNView": false } From 27bdf1f2b0651a48b78004342588dd36da119c35 Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Tue, 25 Aug 2020 10:13:49 +0800 Subject: [PATCH 07/15] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 12 +++++++++++- README.md | 8 ++++++++ main.js | 4 ++++ pageE/setting/updateVersion.vue | 8 ++++++-- pageE/setting/version.vue | 20 +++++++++++++------- pages/mine/index.vue | 2 +- 6 files changed, 43 insertions(+), 11 deletions(-) diff --git a/App.vue b/App.vue index 469409e..3bb066b 100644 --- a/App.vue +++ b/App.vue @@ -28,7 +28,7 @@ // #endif }, onShow(){ - + this.getVersion(); }, onHide(){ @@ -45,6 +45,16 @@ } }) }, + getVersion() { + this.$u.post("Specialci/checkVersion",{ app_version: this.$app_version }).then(res => { + // console.log(res); + if(res.data.app_version != this.$app_version) { + this.$u.route('/pageE/setting/updateVersion', { + status: res.data.is_focus_upgrade + }); + } + }) + }, } } diff --git a/README.md b/README.md index 762c8f6..d0ab8f7 100644 --- a/README.md +++ b/README.md @@ -49,4 +49,12 @@ unescapeHTML(temp){} * @return { object } promise 对象 resolve 返回文件服务器地址 reject 返回错误信息 */ uploadFile({ url, name, filePath }) {} + +/** +* 广告位跳转 +* @param { String } type 跳转类型 1 商品 2 店铺 3 领取优惠券 +* @param { String | Number } id 跳转id 商品id/商家id... +* @return { undefined } undefined +*/ +jumpPage({ type, id }) () ``` \ No newline at end of file diff --git a/main.js b/main.js index 66cc346..c5b63f8 100644 --- a/main.js +++ b/main.js @@ -5,6 +5,10 @@ import uView from "uview-ui"; Vue.config.productionTip = false Vue.use(uView); App.mpType = 'app' + +// 当前 app 版本号 +Vue.prototype.$app_version = '1.0.0'; + Vue.prototype.imService = new IMService(); Vue.prototype.a = 1; import store from '@/common/store/index.js' diff --git a/pageE/setting/updateVersion.vue b/pageE/setting/updateVersion.vue index 569bf89..456b2fb 100644 --- a/pageE/setting/updateVersion.vue +++ b/pageE/setting/updateVersion.vue @@ -1,7 +1,7 @@ @@ -10,6 +10,7 @@ export default { data() { return { + is_focus_upgrade: Boolean, // 是否强制更新 show: true, // 传递给uni-app"rich-text"组件的内容，可以使用"
"进行换行 content: ` @@ -19,6 +20,9 @@ `, } }, + onLoad(option) { + this.is_focus_upgrade = option.status == 1 ? false : true; + }, onReady() { this.show = true; }, diff --git a/pageE/setting/version.vue b/pageE/setting/version.vue index ca9f2a1..c1c05f2 100644 --- a/pageE/setting/version.vue +++ b/pageE/setting/version.vue @@ -3,7 +3,7 @@ 德铭阳光 - 版本:{{ version }} for {{ phone_type }} + 版本: {{ $app_version }} for {{ phone_type }} @@ -12,8 +12,8 @@ 版本更新 - 已是最新版本 - 发现新版本 + 发现新版本: {{ version }} + 已是最新版本 @@ -22,8 +22,9 @@ export default { data() { return { - version: "", + version: '', phone_type: "", + status: '', } }, onLoad() { @@ -33,9 +34,12 @@ export default { methods: { // 检查版本号 getVersion() { - this.$u.post("Specialci/checkVersion",{ app_version: 1 }).then(res => { + this.$u.post("Specialci/checkVersion",{ app_version: this.$app_version }).then(res => { // console.log(res); - this.version = res.data.app_version; + if(res.data.app_version != this.$app_version) { + this.version = res.data.app_version; + this.status = res.data.is_focus_upgrade; // 0 不强制 1 强制 + } }) }, viewAboutUs() { @@ -44,7 +48,9 @@ export default { }); }, updateVersion() { - this.$u.route('/pageE/setting/updateVersion'); + this.$u.route('/pageE/setting/updateVersion', { + status: this.status + }); } } }; diff --git a/pages/mine/index.vue b/pages/mine/index.vue index f4764f9..5a0fcb8 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -179,8 +179,8 @@ export default { }) } else { this.getOrderNumber(); + this.getUserInfo(); } - this.getUserInfo(); }, onNavigationBarButtonTap(e) { // console.log(e); From 9c026bf64d1e7a8b039a4b519933cb4b8dd4b00a Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Tue, 25 Aug 2020 10:40:47 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E5=95=86=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pageE/setting/updateVersion.vue | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pageE/setting/updateVersion.vue b/pageE/setting/updateVersion.vue index 456b2fb..4a65869 100644 --- a/pageE/setting/updateVersion.vue +++ b/pageE/setting/updateVersion.vue @@ -31,7 +31,18 @@ this.closeModal(); }, confirm() { + // ifdef APP-PLUS + if (plus.os.name == "Android") { + const appurl = "market://details?id=自己打包用的包名"; //这个是通用应用市场，如果想指定某个应用商店，需要单独查这个应用商店的包名或scheme及参数 + plus.runtime.openURL(appurl); + } else if(plus.os.name == "ios") { + const appurl = "itms-apps://itunes.apple.com/cn/app/id1144816653?mt=8"; + plus.runtime.openURL(appurl); + } + // endif + // ifndef H5 this.closeModal(); + // endif }, closeModal() { uni.navigateBack(); From 3d4ee2bd4cae44a47f94a6f378611f4acae1b0e9 Mon Sep 17 00:00:00 2001 From: ghusermoon <2673031505@qq.com> Date: Tue, 25 Aug 2020 11:50:45 +0800 Subject: [PATCH 09/15] fixing bug --- pageE/setting/updateVersion.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pageE/setting/updateVersion.vue b/pageE/setting/updateVersion.vue index 4a65869..86884a7 100644 --- a/pageE/setting/updateVersion.vue +++ b/pageE/setting/updateVersion.vue @@ -31,7 +31,7 @@ this.closeModal(); }, confirm() { - // ifdef APP-PLUS + // #ifdef APP-PLUS if (plus.os.name == "Android") { const appurl = "market://details?id=自己打包用的包名"; //这个是通用应用市场，如果想指定某个应用商店，需要单独查这个应用商店的包名或scheme及参数 plus.runtime.openURL(appurl); @@ -39,10 +39,10 @@ const appurl = "itms-apps://itunes.apple.com/cn/app/id1144816653?mt=8"; plus.runtime.openURL(appurl); } - // endif - // ifndef H5 + // #endif + // #ifdef H5 this.closeModal(); - // endif + // #endif }, closeModal() { uni.navigateBack(); From 71a82a10b0156ef9d5cb4632523375fe1170469a Mon Sep 17 00:00:00 2001 From: luyuan <1162963624@qq.com> Date: Tue, 25 Aug 2020 11:51:16 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pageE/setting/updateVersion.vue | 10 +++++----- pages.json | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pageE/setting/updateVersion.vue b/pageE/setting/updateVersion.vue index 4a65869..08f7f49 100644 --- a/pageE/setting/updateVersion.vue +++ b/pageE/setting/updateVersion.vue @@ -1,7 +1,7 @@ @@ -33,14 +33,14 @@ confirm() { // ifdef APP-PLUS if (plus.os.name == "Android") { - const appurl = "market://details?id=自己打包用的包名"; //这个是通用应用市场，如果想指定某个应用商店，需要单独查这个应用商店的包名或scheme及参数 + const appurl = "market://details?id=com.tencent.mobileqq"; //这个是通用应用市场，如果想指定某个应用商店，需要单独查这个应用商店的包名或scheme及参数 plus.runtime.openURL(appurl); } else if(plus.os.name == "ios") { const appurl = "itms-apps://itunes.apple.com/cn/app/id1144816653?mt=8"; plus.runtime.openURL(appurl); } // endif - // ifndef H5 + // ifdef H5 this.closeModal(); // endif }, @@ -51,11 +51,11 @@ } -