From 0e816fd7d1696ca55739190cda31ab533ca0dd96 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Sun, 25 Sep 2022 11:45:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E3=80=90=E5=8D=87=E7=BA=A7=E3=80=91?= =?UTF-8?q?=E6=9B=B4=E6=96=B0uview=E5=88=B01.8.6=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/u-calendar/u-calendar.vue | 6 +- .../u-collapse-item/u-collapse-item.vue | 3 +- .../uview-ui/components/u-image/u-image.vue | 1 + .../uview-ui/components/u-input/u-input.vue | 11 ++- .../components/u-number-box/u-number-box.vue | 2 +- .../components/u-parse/libs/trees.vue | 2 +- .../uview-ui/components/u-select/u-select.vue | 7 +- .../uview-ui/components/u-tabs/u-tabs.vue | 4 +- .../uview-ui/components/u-th/u-th.vue | 2 +- .../uview-ui/components/u-upload/u-upload.vue | 7 +- .../uview-ui/components/uview-v1/uview-v1.vue | 0 .../CoreShop/uview-ui/libs/config/config.js | 6 +- .../CoreShop/uview-ui/libs/function/guid.js | 4 +- .../CoreShop/uview-ui/libs/function/test.js | 4 +- .../CoreShop/uview-ui/libs/mixin/mixin.js | 9 +-- .../uview-ui/libs/util/async-validator.js | 2 +- .../CoreShop/uview-ui/package.json | 68 ++++++++----------- 17 files changed, 72 insertions(+), 66 deletions(-) create mode 100644 CoreCms.Net.Uni-App/CoreShop/uview-ui/components/uview-v1/uview-v1.vue diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-calendar/u-calendar.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-calendar/u-calendar.vue index 2b30184..70059cb 100644 --- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-calendar/u-calendar.vue +++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-calendar/u-calendar.vue @@ -288,6 +288,10 @@ }, init() { let now = new Date(); + let minDate = new Date(this.minDate); + let maxDate = new Date(this.maxDate); + if (now < minDate) now = minDate; + if (now > maxDate) now = maxDate; this.year = now.getFullYear(); this.month = now.getMonth() + 1; this.day = now.getDate(); @@ -636,4 +640,4 @@ } } } - \ No newline at end of file + diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-collapse-item/u-collapse-item.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-collapse-item/u-collapse-item.vue index 3b66bfa..6656657 100644 --- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-collapse-item/u-collapse-item.vue +++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-collapse-item/u-collapse-item.vue @@ -110,7 +110,8 @@ this.parent = this.$u.$parent.call(this, 'u-collapse'); if(this.parent) { this.nameSync = this.name ? this.name : this.parent.childrens.length; - this.parent.childrens.push(this); + // 不存在时才添加本实例 + !this.parent.childrens.includes(this) && this.parent.childrens.push(this); this.headStyle = this.parent.headStyle; this.bodyStyle = this.parent.bodyStyle; this.arrowColor = this.parent.arrowColor; diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-image/u-image.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-image/u-image.vue index c729c3c..8a890be 100644 --- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-image/u-image.vue +++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-image/u-image.vue @@ -172,6 +172,7 @@ export default { this.loading = false; } else { this.isError = false; + this.loading = true; } } } diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-input/u-input.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-input/u-input.vue index f2aea72..301e800 100644 --- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-input/u-input.vue +++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-input/u-input.vue @@ -50,6 +50,7 @@ :selection-end="uSelectionEnd" :selection-start="uSelectionStart" :show-confirm-bar="showConfirmbar" + :adjust-position="adjustPosition" @focus="onFocus" @blur="handleBlur" @input="handleInput" @@ -213,6 +214,11 @@ export default { showConfirmbar:{ type:Boolean, default:true + }, + // 弹出键盘时是否自动调节高度，uni-app默认值是true + adjustPosition: { + type: Boolean, + default: true } }, data() { @@ -300,11 +306,12 @@ export default { handleBlur(event) { // 最开始使用的是监听图标@touchstart事件，自从hx2.8.4后，此方法在微信小程序出错 // 这里改为监听点击事件，手点击清除图标时，同时也发生了@blur事件，导致图标消失而无法点击，这里做一个延时 + let value = event.detail.value; setTimeout(() => { this.focused = false; }, 100) // vue 原生的方法 return 出去 - this.$emit('blur', event.detail.value); + this.$emit('blur', value); setTimeout(() => { // 头条小程序由于自身bug，导致中文下，每按下一个键(尚未完成输入)，都会触发一次@input，导致错误，这里进行判断处理 // #ifdef MP-TOUTIAO @@ -312,7 +319,7 @@ export default { this.lastValue = value; // #endif // 将当前的值发送到 u-form-item 进行校验 - this.dispatch('u-form-item', 'on-form-blur', event.detail.value); + this.dispatch('u-form-item', 'on-form-blur', value); }, 40) }, onFormItemError(status) { diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-number-box/u-number-box.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-number-box/u-number-box.vue index 54a679e..3b8e8bf 100644 --- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-number-box/u-number-box.vue +++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-number-box/u-number-box.vue @@ -10,7 +10,7 @@ - + {{ item1[labelName] }} @@ -278,12 +278,13 @@ export default { let columnIndex = e.detail.value; // 由于后面是需要push进数组的，所以需要先清空数组 this.selectValue = []; + this.defaultSelector = columnIndex; if(this.mode == 'mutil-column-auto') { // 对比前后两个数组，寻找变更的是哪一列，如果某一个元素不同，即可判定该列发生了变化 this.lastSelectIndex.map((val, idx) => { if (val != columnIndex[idx]) index = idx; }); - this.defaultSelector = columnIndex; + for (let i = index + 1; i < this.columnNum; i++) { // 当前变化列的下一列的数据，需要获取上一列的数据，同时需要指定是上一列的第几个的children，再往后的 // 默认是队列的第一个为默认选项 @@ -333,6 +334,8 @@ export default { }, close() { this.$emit('input', false); + // 重置default-value默认值 + this.$set(this, 'defaultSelector', [0]); }, // 点击确定或者取消 getResult(event = null) { diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-tabs/u-tabs.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-tabs/u-tabs.vue index 0c59658..3775fcd 100644 --- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-tabs/u-tabs.vue +++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-tabs/u-tabs.vue @@ -3,9 +3,9 @@ background: bgColor }"> - + - + diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-th/u-th.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-th/u-th.vue index 9fe5a16..c736b9b 100644 --- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-th/u-th.vue +++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-th/u-th.vue @@ -39,7 +39,7 @@ style.padding = this.parent.padding; style.borderBottom = `solid 1px ${this.parent.borderColor}`; style.borderRight = `solid 1px ${this.parent.borderColor}`; - Object.assign(style, this.parent.style); + Object.assign(style, this.parent.thStyle); this.thStyle = style; } } diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-upload/u-upload.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-upload/u-upload.vue index f4d4b76..c7a9f05 100644 --- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-upload/u-upload.vue +++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/u-upload/u-upload.vue @@ -21,7 +21,7 @@ { // 判断是否json字符串，将其转为json格式 let data = this.toJson && this.$u.test.jsonString(res.data) ? JSON.parse(res.data) : res.data; @@ -498,7 +501,7 @@ export default { // 执行移除图片的动作，上方代码只是判断是否可以移除 handlerDeleteItem(index) { // 如果文件正在上传中，终止上传任务，进度在0 < progress < 100则意味着正在上传 - if (this.lists[index].process < 100 && this.lists[index].process > 0) { + if (this.lists[index].progress < 100 && this.lists[index].progress > 0) { typeof this.lists[index].uploadTask != 'undefined' && this.lists[index].uploadTask.abort(); } this.lists.splice(index, 1); diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/uview-v1/uview-v1.vue b/CoreCms.Net.Uni-App/CoreShop/uview-ui/components/uview-v1/uview-v1.vue new file mode 100644 index 0000000..e69de29 diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/config/config.js b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/config/config.js index 44925a1..d77e971 100644 --- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/config/config.js +++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/config/config.js @@ -1,5 +1,5 @@ -// 此版本发布于2020-03-17 -let version = '1.8.4'; +// 此版本发布于2022-04-19 +let version = '1.8.6'; export default { v: version, @@ -12,4 +12,4 @@ export default { 'error', 'warning' ] -} \ No newline at end of file +} diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/function/guid.js b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/function/guid.js index 8497664..e04190a 100644 --- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/function/guid.js +++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/function/guid.js @@ -6,7 +6,7 @@ * v-for的时候,推荐使用后端返回的id而不是循环的index * @param {Number} len uuid的长度 * @param {Boolean} firstU 将返回的首字母置为"u" - * @param {Nubmer} radix 生成uuid的基数(意味着返回的字符串都是这个基数),2-二进制,8-八进制,10-十进制,16-十六进制 + * @param {Number} radix 生成uuid的基数(意味着返回的字符串都是这个基数),2-二进制,8-八进制,10-十进制,16-十六进制 */ function guid(len = 32, firstU = true, radix = null) { let chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'.split(''); @@ -29,7 +29,7 @@ function guid(len = 32, firstU = true, radix = null) { } } } - // 移除第一个字符,并用u替代,因为第一个字符为数值时,该guuid不能用作id或者class + // 移除第一个字符,并用u替代,因为第一个字符为数值时,该guid不能用作id或者class if (firstU) { uuid.shift(); return 'u' + uuid.join(''); diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/function/test.js b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/function/test.js index fd25e18..1fde462 100644 --- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/function/test.js +++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/function/test.js @@ -2,7 +2,7 @@ * 验证电子邮箱格式 */ function email(value) { - return /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/.test(value); + return /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/.test(value); } /** @@ -37,7 +37,7 @@ function dateISO(value) { * 验证十进制数字 */ function number(value) { - return /^(?:-?\d+|-?\d{1,3}(?:,\d{3})+)?(?:\.\d+)?$/.test(value) + return /^[\+-]?(\d+\.?\d*|\.\d+|\d\.\d+e\+\d+)$/.test(value) } /** diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/mixin/mixin.js b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/mixin/mixin.js index e6ceed1..cb64545 100644 --- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/mixin/mixin.js +++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/mixin/mixin.js @@ -1,11 +1,6 @@ -import * as GlobalConstVars from '@/common/setting/constVarsHelper.js' - - module.exports = { data() { - return { - $globalConstVars: GlobalConstVars - } + return {} }, onLoad() { // getRect挂载到$u上，因为这方法需要使用in(this)，所以无法把它独立成一个单独的文件导出 @@ -53,7 +48,7 @@ module.exports = { uni.$emit('uOnReachBottom') }, beforeDestroy() { - // 判断当前页面是否存在parent和chldren，一般在checkbox和checkbox-group父子联动的场景会有此情况 + // 判断当前页面是否存在parent和children，一般在checkbox和checkbox-group父子联动的场景会有此情况 // 组件销毁时，移除子组件在父组件children数组中的实例，释放资源，避免数据混乱 if(this.parent && uni.$u.test.array(this.parent.children)) { // 组件销毁时，移除父组件中的children数组中对应的实例 diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/util/async-validator.js b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/util/async-validator.js index d7215b9..6183d0a 100644 --- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/util/async-validator.js +++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/libs/util/async-validator.js @@ -437,7 +437,7 @@ function range(rule, value, source, errors, options) { } if (str) { - // 处理码点大于U+010000的文字length属性不准确的bug，如"𠮷𠮷𠮷".lenght !== 3 + // 处理码点大于U+010000的文字length属性不准确的bug，如"𠮷𠮷𠮷".length !== 3 val = value.replace(spRegexp, '_').length; } diff --git a/CoreCms.Net.Uni-App/CoreShop/uview-ui/package.json b/CoreCms.Net.Uni-App/CoreShop/uview-ui/package.json index 431d585..f911d31 100644 --- a/CoreCms.Net.Uni-App/CoreShop/uview-ui/package.json +++ b/CoreCms.Net.Uni-App/CoreShop/uview-ui/package.json @@ -1,39 +1,31 @@ { - "name": "uview-ui", - "version": "1.8.4", - "description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水", - "main": "index.js", - "keywords": [ - "uview", - "uView", - "uni-app", - "uni-app ui", - "uniapp", - "uviewui", - "uview ui", - "uviewUI", - "uViewui", - "uViewUI", - "uView UI", - "uni ui", - "uni UI", - "uniapp ui", - "ui", - "UI框架", - "uniapp ui框架", - "uniapp UI" - ], - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "" - }, - "devDependencies": { - "node-sass": "^4.14.0", - "sass-loader": "^8.0.2" - }, - "author": "uView", - "license": "MIT" -} + "name": "uView", + "version": "1.8.6", + "description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水", + "main": "index.js", + "keywords": [ + "uview", + "ui", + "uni-app" + ], + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "" + }, + "devDependencies": { + "node-sass": "^4.14.0", + "sass-loader": "^8.0.2" + }, + "author": "uView", + "license": "MIT", + "id": "uview-v1", + "dcloudext": { + "category": [ + "前端组件", + "通用组件" + ] + } +} \ No newline at end of file -- Gitee From 6dc57dec169330b6e915502e315a5a540572f2d4 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Sun, 25 Sep 2022 12:07:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E3=80=90=E8=B0=83=E6=95=B4=E3=80=91pages?= =?UTF-8?q?=E4=B8=8B=E6=96=87=E4=BB=B6=E5=A4=B9=E8=BF=9B=E8=A1=8C=E5=88=86?= =?UTF-8?q?=E5=8C=85=E5=A4=84=E7=90=86=EF=BC=8C=E5=B0=86=E4=B8=BB=E5=8C=85?= =?UTF-8?q?=E5=A4=A7=E5=B0=8F=E5=87=8F=E5=B0=91=E8=87=B31200kb=E5=B7=A6?= =?UTF-8?q?=E5=8F=B3=EF=BC=8C=E6=96=B9=E4=BE=BF=E7=94=A8=E6=88=B7=E5=BC=95?= =?UTF-8?q?=E7=94=A8=E7=BB=84=E4=BB=B6=E5=92=8C=E4=BA=8C=E5=BC=80=E6=96=B0?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CoreCms.Net.Uni-App/CoreShop/manifest.json | 2 +- CoreCms.Net.Uni-App/CoreShop/pages.json | 437 +++++++++++++-------- 2 files changed, 264 insertions(+), 175 deletions(-) diff --git a/CoreCms.Net.Uni-App/CoreShop/manifest.json b/CoreCms.Net.Uni-App/CoreShop/manifest.json index d3a60f7..4fe4852 100644 --- a/CoreCms.Net.Uni-App/CoreShop/manifest.json +++ b/CoreCms.Net.Uni-App/CoreShop/manifest.json @@ -102,7 +102,7 @@ "quickapp" : {}, /* 快应用特有相关 */ "mp-weixin" : { - "appid" : "wx11d95cdaee6058f6", + "appid" : "wx6fc139d4de0b470f", "setting" : { "urlCheck" : true, "postcss" : true, diff --git a/CoreCms.Net.Uni-App/CoreShop/pages.json b/CoreCms.Net.Uni-App/CoreShop/pages.json index ed355c4..4e4bb49 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages.json +++ b/CoreCms.Net.Uni-App/CoreShop/pages.json @@ -47,13 +47,6 @@ "navigationBarTitleText": "会员中心" } }, - { - "path": "pages/search/search", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "搜索" - } - }, { "path": "pages/category/index/index", "style": { @@ -67,201 +60,297 @@ "navigationBarTextStyle": "black", "navigationBarTitleText": "商品列表" } - }, - { - "path": "pages/goods/goodDetails/goodDetails", - "style": { - "navigationBarTextStyle": "black", - // #ifdef H5 - "titleNView": false, - // #endif - "navigationBarTitleText": "商品详情", - "navigationStyle": "custom" - } - }, - { - "path": "pages/placeOrder/index/index", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "提交订单" - } - }, - { - "path": "pages/placeOrder/invoice/invoice", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "发票" - } - }, - { - "path": "pages/placeOrder/storeList/storeList", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "门店列表" - } - }, - { - "path": "pages/payment/pay/pay", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "支付" - } - }, - { - "path": "pages/payment/waiting/waiting", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "等待支付" - } - }, - { - "path": "pages/payment/result/result", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "支付结果" - } - }, - - { - "path": "pages/article/details/details", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "文章详情" - } - }, - { - "path": "pages/article/list/list", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "文章列表" - } - }, - { - "path": "pages/login/loginBySMS/loginBySMS", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "授权登录" - } - }, - { - "path": "pages/share/sharePoster/sharePoster", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "分享" - } - }, + } + ], + "subpackages": [ { - "path": "pages/activity/pinTuan/list/list", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "拼团列表" - } + "root": "pages/share", + "name": "share", + "pages": [ + { + "path": "sharePoster/sharePoster", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "分享" + } + }, + { + "path": "jump/jump", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "加载中..." + } + } + ] }, { - "path": "pages/activity/pinTuan/details/details", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "拼团详情" - } + "root": "pages/serviceGoods", + "name": "serviceGoods", + "pages": [ + { + "path": "index/index", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "服务商品列表" + } + }, + { + "path": "details/details", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "服务商品详情" + } + } + ] }, { - "path": "pages/activity/seckill/list/list", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "秒杀列表" - } + "root": "pages/map", + "name": "map", + "pages": [ + { + "path": "map", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "地图展示" + } + } + ] }, { - "path": "pages/activity/seckill/details/details", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "秒杀详情" - } + "root": "pages/reward", + "name": "reward", + "pages": [ + { + "path": "reward", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "打赏" + } + } + ] }, { - "path": "pages/activity/groupBuying/list/list", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "团购列表" - } + "root": "pages/search", + "name": "search", + "pages": [ + { + "path": "search", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "搜索" + } + } + ] }, { - "path": "pages/activity/groupBuying/details/details", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "团购详情" - } + "root": "pages/placeOrder", + "name": "placeOrder", + "pages": [ + { + "path": "index/index", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "提交订单" + } + }, + { + "path": "invoice/invoice", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "发票" + } + }, + { + "path": "storeList/storeList", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "门店列表" + } + } + ] }, { - "path": "pages/form/details/details", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "万能表单" - } + "root": "pages/payment", + "name": "payment", + "pages": [ + { + "path": "pay/pay", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "支付" + } + }, + { + "path": "waiting/waiting", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "等待支付" + } + }, + { + "path": "result/result", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "支付结果" + } + } + ] }, - { - "path": "pages/share/jump/jump", - "style": { - "navigationBarTextStyle": "black", - // #ifdef H5 - "titleNView": false, - // #endif - "navigationBarTitleText": "加载中..." - } + "root": "pages/storeMap", + "name": "storeMap", + "pages": [ + { + "path": "storeMap", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "门店列表" + } + } + ] }, { - "path": "pages/storeMap/storeMap", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "门店列表" - } + "root": "pages/login", + "name": "login", + "pages": [ + { + "path": "loginBySMS/loginBySMS", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "授权登录" + } + }, + { + "path": "forget/forget", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "忘记密码" + } + }, + { + "path": "loginByAccount/loginByAccount", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "账号登录" + } + } + ] }, - { - "path": "pages/serviceGoods/index/index", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "服务商品列表" - } + "root": "pages/goods", + "name": "goods", + "pages": [ + { + "path": "goodDetails/goodDetails", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "商品详情", + "navigationStyle": "custom" + } + }, + { + "path": "goodComments/goodComments", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "商品评论" + } + } + ] }, { - "path": "pages/serviceGoods/details/details", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "服务商品详情" - } + "root": "pages/form", + "name": "form", + "pages": [ + { + "path": "details/details", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "万能表单" + } + } + ] }, { - "path": "pages/coupon/coupon", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "优惠券列表" - } + "root": "pages/coupon", + "name": "coupon", + "pages": [ + { + "path": "coupon", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "优惠券列表" + } + } + ] }, { - "path": "pages/map/map", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "地图展示" - } + "root": "pages/article", + "name": "article", + "pages": [ + { + "path": "details/details", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "文章详情" + } + }, + { + "path": "list/list", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "文章列表" + } + } + ] }, { - "path": "pages/goods/goodComments/goodComments", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "商品评论" - } + "root": "pages/activity", + "name": "template", + "pages": [ + { + "path": "pinTuan/list/list", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "拼团列表" + } + }, + { + "path": "pinTuan/details/details", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "拼团详情" + } + }, + { + "path": "seckill/list/list", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "秒杀列表" + } + }, + { + "path": "seckill/details/details", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "秒杀详情" + } + }, + { + "path": "groupBuying/list/list", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "团购列表" + } + }, + { + "path": "groupBuying/details/details", + "style": { + "navigationBarTextStyle": "black", + "navigationBarTitleText": "团购详情" + } + } + ] }, - { - "path": "pages/reward/reward", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "打赏" - } - } - ], - "subpackages": [ { "root": "pages/member", "name": "member", -- Gitee From 57a9e7dbec87cbed8ebb3ca6189a4f61fbd3b128 Mon Sep 17 00:00:00 2001 From: JianWeie Date: Sun, 25 Sep 2022 13:19:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E3=80=90=E4=BF=AE=E5=A4=8D=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A9=BA=E6=95=B0=E6=8D=AE=E4=B8=8B=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E4=BA=86empty=E5=9B=BE=E7=89=87=E5=A4=B1=E6=95=88?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82=20=E3=80=90=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E3=80=91pages=E4=B8=8B=E6=96=87=E4=BB=B6=E5=A4=B9?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=88=86=E5=8C=85=E5=A4=84=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E5=B0=86=E4=B8=BB=E5=8C=85=E5=A4=A7=E5=B0=8F=E5=87=8F=E5=B0=91?= =?UTF-8?q?=E8=87=B31200kb=E5=B7=A6=E5=8F=B3=EF=BC=8C=E6=96=B9=E4=BE=BF?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=BC=95=E7=94=A8=E7=BB=84=E4=BB=B6=E5=92=8C?= =?UTF-8?q?=E4=BA=8C=E5=BC=80=E6=96=B0=E5=86=85=E5=AE=B9=E3=80=82=20?= =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E6=B8=85=E7=90=86=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=B8=AD=E7=9A=84=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E4=BF=9D=E7=95=99=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/request/http.interceptor.js | 23 -- .../common/setting/constVarsHelper.js | 6 - .../coreshop-login-modal.vue | 164 -------- .../coreshop-page/coreshop-video.vue | 4 +- .../coreshop-paymentsByAli.vue | 182 --------- .../coreshop-paymentsByApp.vue | 237 ------------ .../coreshop-paymentsByH5.vue | 334 ---------------- .../coreshop-paymentsByTt.vue | 232 ----------- .../components/coreshop-share/shareByAli.vue | 130 ------- .../components/coreshop-share/shareByApp.vue | 265 ------------- .../components/coreshop-share/shareByTt.vue | 124 ------ .../components/coreshop-share/shareByh5.vue | 185 --------- CoreCms.Net.Uni-App/CoreShop/main.js | 9 + CoreCms.Net.Uni-App/CoreShop/pages.json | 28 -- .../activity/groupBuying/details/details.vue | 93 ----- .../activity/pinTuan/details/details.vue | 99 +---- .../activity/seckill/details/details.vue | 102 +---- .../CoreShop/pages/category/list/list.scss | 2 +- .../CoreShop/pages/category/list/list.vue | 31 -- .../pages/goods/goodDetails/goodDetails.vue | 102 +---- .../CoreShop/pages/index/custom/custom.vue | 13 - .../CoreShop/pages/index/default/default.vue | 54 --- .../CoreShop/pages/index/member/member.vue | 70 ---- .../CoreShop/pages/login/forget/forget.vue | 203 ---------- .../login/loginByAccount/loginByAccount.vue | 309 --------------- .../pages/login/loginBySMS/loginBySMS.scss | 38 -- .../pages/login/loginBySMS/loginBySMS.vue | 365 ------------------ .../pages/member/address/list/list.vue | 10 - .../member/afterSales/submit/submit.scss | 9 +- .../pages/member/afterSales/submit/submit.vue | 16 - .../pages/member/agent/myStore/myStore.vue | 69 ---- .../pages/member/agent/panel/panel.vue | 19 +- .../member/balance/bankcard/bankcard.vue | 10 - .../balance/withdrawCash/withdrawCash.scss | 6 +- .../balance/withdrawCash/withdrawCash.vue | 7 - .../member/distribution/myStore/myStore.vue | 70 +--- .../pages/member/distribution/panel/panel.vue | 19 +- .../CoreShop/pages/member/invite/index.vue | 40 +- .../pages/member/order/detail/detail.vue | 8 - .../pages/member/order/evaluate/evaluate.scss | 4 +- .../pages/member/order/evaluate/evaluate.vue | 16 - .../pages/member/order/index/index.vue | 12 - .../order/invitationGroup/invitationGroup.vue | 69 +--- .../pages/member/setting/index/index.vue | 10 +- .../CoreShop/pages/payment/pay/pay.vue | 48 +-- .../CoreShop/pages/placeOrder/index/index.vue | 51 --- .../pages/placeOrder/invoice/invoice.vue | 31 -- .../pages/placeOrder/storeList/storeList.vue | 9 - .../pages/share/sharePoster/sharePoster.vue | 6 - .../CoreShop/static/style/coreCommon.scss | 2 +- 50 files changed, 35 insertions(+), 3910 deletions(-) delete mode 100644 CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByAli.vue delete mode 100644 CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByApp.vue delete mode 100644 CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByH5.vue delete mode 100644 CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByTt.vue delete mode 100644 CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByAli.vue delete mode 100644 CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByApp.vue delete mode 100644 CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByTt.vue delete mode 100644 CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByh5.vue delete mode 100644 CoreCms.Net.Uni-App/CoreShop/pages/login/forget/forget.vue delete mode 100644 CoreCms.Net.Uni-App/CoreShop/pages/login/loginByAccount/loginByAccount.vue delete mode 100644 CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.scss delete mode 100644 CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.vue diff --git a/CoreCms.Net.Uni-App/CoreShop/common/request/http.interceptor.js b/CoreCms.Net.Uni-App/CoreShop/common/request/http.interceptor.js index 8aee044..0d1f9db 100644 --- a/CoreCms.Net.Uni-App/CoreShop/common/request/http.interceptor.js +++ b/CoreCms.Net.Uni-App/CoreShop/common/request/http.interceptor.js @@ -51,31 +51,10 @@ const install = (Vue, vm) => { //console.log(page.route); // 登录信息过期或者未登录 if (result.data === 14007 || result.data === 14006) { - // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE - if (page.route.indexOf('pages/login/loginBySMS/loginBySMS') < 0) { - db.del("userToken"); - uni.showToast({ - title: result.msg, - icon: 'none', - duration: 1000, - complete: function () { - setTimeout(function () { - uni.hideToast(); - uni.navigateTo({ - url: '/pages/login/loginBySMS/loginBySMS' - }); - }, - 1000); - } - }); - } - // #endif - // #ifdef MP-WEIXIN || MP-ALIPAY || MP-TOUTIAO db.del("userToken"); console.log("开启登录弹窗"); //Vue.prototype.$store.commit('showLoginTip', true); Vue.prototype.$store.commit('hasLogin', false); - // #endif } } @@ -83,8 +62,6 @@ const install = (Vue, vm) => { // res为服务端返回值，可能有code，result等字段 // 这里对res.result进行返回，将会在this.$u.post(url).then(res => {})的then回调中的res的到 // 如果配置了originalData为true，请留意这里的返回值 - - } } diff --git a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js index 9ee458b..9b97878 100644 --- a/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js +++ b/CoreCms.Net.Uni-App/CoreShop/common/setting/constVarsHelper.js @@ -7,7 +7,6 @@ export const apiBaseUrl = 'https://api.demo.coreshop.cn'; //项目静态资源请求地址，如果使用官方的静态文件地址可以直接替换为：https://files.cdn.coreshop.cn export const apiFilesUrl = 'https://files.cdn.coreshop.cn'; -export const h5Url = apiBaseUrl + "/wap/"; //H5端网站地址, // #ifdef H5 export const baseUrl = process.env.NODE_ENV === 'development' ? window.location.origin + '/' : apiBaseUrl @@ -22,11 +21,6 @@ export const paymentType = { serviceOrder: 5, //服务订单 }; -// #ifdef MP-TOUTIAO -export const ttPlatform = 'toutiao'; //toutiao=今日头条小程序, douyin=抖音小程序, pipixia=皮皮虾小程序, huoshan=火山小视频小程序 -// #endif - - //nav页面导航类型 export const navLinkType = { urlLink: 1, //"URL链接" diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue index bcfa999..c2a71ef 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-login-modal/coreshop-login-modal.vue @@ -1,44 +1,6 @@ @@ -193,11 +154,6 @@ hideModal() { this.showLogin = false; }, - // 去登录 - toAccountLogin() { - this.showLogin = false; - this.$u.route('/pages/login/loginByAccount/loginByAccount'); - }, // 小程序，取消登录 closeAuth() { this.showLogin = false; @@ -236,12 +192,7 @@ _this.$refs.uToast.show({ title: '登录成功', type: 'success', }) return false } else { - // #ifdef MP-WEIXIN _this.sessionAuthIdTool = res.data.sessionAuthId; - // #endif - // #ifndef MP-WEIXIN - _this.$u.route({ type: 'navigateTo', url: '/pages/login/loginBySMS/loginBySMS?sessionAuthId=' + res.data.sessionAuthId }); - // #endif } } else { _this.$refs.uToast.show({ title: '登录失败，请重试', type: 'error', }) @@ -290,122 +241,7 @@ _this.$u.toast('登录失败，请重试') } }) - }, - // #ifdef MP-ALIPAY - getALICode() { - let that = this - uni.login({ - scopes: 'auth_user', - success: (res) => { - if (res.authCode) { - uni.getUserInfo({ - provider: 'alipay', - success: function (infoRes) { - if (infoRes.errMsg == "getUserInfo:ok") { - let userInfo = { - 'nickname': infoRes.nickName, - 'avatar': infoRes.avatar - } - that.aLiLoginStep1(res.authCode, userInfo); - } - }, - fail: function (errorRes) { - this.$u.toast('未取得用户昵称头像信息'); - } - }); - } else { - this.$u.toast('未取得code'); - } - }, - fail: function (res) { - this.$u.toast('用户授权失败my.login'); - } - }); - }, - aLiLoginStep1(code, userInfo) { - let data = { - 'code': code, - 'userInfo': userInfo - } - this.$u.api.alilogin1(data).then(res => { - this.alipayNoLogin = false; - if (res.status) { - this.sessionAuthIdTool = res.data.sessionAuthId - //判断是否返回了token，如果没有，就说明没有绑定账号，跳转到绑定页面 - if (!res.data.hasOwnProperty('token')) { - this.$u.route({ type: 'redirectTo', url: '/pages/login/loginBySMS/loginBySMS?sessionAuthId=' + res.data.sessionAuthId }); - } else { - this.$db.set('userToken', res.data.token) - uni.navigateBack({ - delta: 1 - }); - } - } else { - this.$u.toast(res.msg) - } - }) - }, - // #endif - // #ifdef MP-TOUTIAO - ttLogin() { - let that = this - uni.login({ - provider: 'toutiao', - success: (res) => { - //console.log(res); - if (res.errMsg == "login:ok") { - uni.getUserInfo({ - provider: 'toutiao', - success: function (infoRes) { - //console.log(infoRes); - if (infoRes.errMsg == "getUserInfo:ok") { - let code = res.code; - let userInfo = { - 'nickname': infoRes.userInfo.nickName, - 'avatar': infoRes.userInfo.avatarUrl, - 'gender': infoRes.userInfo.gender, - 'language': infoRes.userInfo.language, - 'country': infoRes.userInfo.country, - 'city': infoRes.userInfo.city, - 'province': infoRes.userInfo.province - } - that.ttLoginStep(code, userInfo); - } - }, - fail: function (errorRes) { - this.$u.toast('未取得用户昵称头像信息'); - } - }); - } else { - this.$u.toast('未取得code'); - } - }, - fail: function (res) { - this.$u.toast('用户授权失败my.login'); - } - }); - }, - ttLoginStep(code, userInfo) { - let data = { - 'code': code, - 'userInfo': userInfo - } - this.$u.api.ttlogin(data).then(res => { - if (res.status) { - if (!res.data.hasOwnProperty('token')) { - this.$u.route({ type: 'redirectTo', url: '/pages/login/loginBySMS/loginBySMS?sessionAuthId=' + res.data.userId }); - } else { - this.$db.set('userToken', res.data.token) - uni.navigateBack({ - delta: 1 - }); - } - } else { - this.$u.toast(res.msg) - } - }) } - // #endif } }; diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-video.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-video.vue index e050c3a..dc35fbe 100644 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-video.vue +++ b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-page/coreshop-video.vue @@ -25,9 +25,7 @@ }, onReady: function (res) { - // #ifndef MP-ALIPAY - this.videoContext = uni.createVideoContext('myVideo') - // #endif + }, methods: { diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByAli.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByAli.vue deleted file mode 100644 index 1a07e0b..0000000 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByAli.vue +++ /dev/null @@ -1,182 +0,0 @@ - - - - - - diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByApp.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByApp.vue deleted file mode 100644 index f1b4a36..0000000 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByApp.vue +++ /dev/null @@ -1,237 +0,0 @@ - - - - - - diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByH5.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByH5.vue deleted file mode 100644 index 91b2fd0..0000000 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByH5.vue +++ /dev/null @@ -1,334 +0,0 @@ - - - - diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByTt.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByTt.vue deleted file mode 100644 index 27a6d71..0000000 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-payments/coreshop-paymentsByTt.vue +++ /dev/null @@ -1,232 +0,0 @@ - - - - - diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByAli.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByAli.vue deleted file mode 100644 index ed24596..0000000 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByAli.vue +++ /dev/null @@ -1,130 +0,0 @@ - - - diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByApp.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByApp.vue deleted file mode 100644 index 9224587..0000000 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByApp.vue +++ /dev/null @@ -1,265 +0,0 @@ - - - diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByTt.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByTt.vue deleted file mode 100644 index 7776108..0000000 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByTt.vue +++ /dev/null @@ -1,124 +0,0 @@ - - - diff --git a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByh5.vue b/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByh5.vue deleted file mode 100644 index 3b68043..0000000 --- a/CoreCms.Net.Uni-App/CoreShop/components/coreshop-share/shareByh5.vue +++ /dev/null @@ -1,185 +0,0 @@ - - - diff --git a/CoreCms.Net.Uni-App/CoreShop/main.js b/CoreCms.Net.Uni-App/CoreShop/main.js index 7bef6ec..0c4cb4a 100644 --- a/CoreCms.Net.Uni-App/CoreShop/main.js +++ b/CoreCms.Net.Uni-App/CoreShop/main.js @@ -23,6 +23,15 @@ Vue.use(uView); let mpShare = require('@/uview-ui/libs/mixin/mpShare.js'); Vue.mixin(mpShare) +//全局引用常量配置文件,用于template内代码使用 +Vue.mixin({ + data() { + return { + $globalConstVars: GlobalConstVars + } + } +}) + Vue.config.productionTip = false Vue.prototype.$upload = Upload; Vue.prototype.$common = Common; diff --git a/CoreCms.Net.Uni-App/CoreShop/pages.json b/CoreCms.Net.Uni-App/CoreShop/pages.json index 4e4bb49..9c95269 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages.json +++ b/CoreCms.Net.Uni-App/CoreShop/pages.json @@ -209,33 +209,6 @@ } ] }, - { - "root": "pages/login", - "name": "login", - "pages": [ - { - "path": "loginBySMS/loginBySMS", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "授权登录" - } - }, - { - "path": "forget/forget", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "忘记密码" - } - }, - { - "path": "loginByAccount/loginByAccount", - "style": { - "navigationBarTextStyle": "black", - "navigationBarTitleText": "账号登录" - } - } - ] - }, { "root": "pages/goods", "name": "goods", @@ -830,7 +803,6 @@ }, { "pagePath": "pages/index/member/member", - //"pagePath": "pages/login/loginByAccount/loginByAccount", "text": "我的", "iconPath": "static/images/indexMenus/index04.png", "selectedIconPath": "static/images/indexMenus/index04_1.png" diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue index 07740be..c4f88a9 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/groupBuying/details/details.vue @@ -148,21 +148,7 @@ - - - - - - - - - - - - - - @@ -342,18 +328,11 @@ - - - - - - - @@ -380,42 +359,14 @@ import { goods, articles, commonUse, tools } from '@/common/mixins/mixinsHelper.js' import coreshopNavbarSlot from '@/components/coreshop-navbar-slot/coreshop-navbar-slot.vue'; import spec from '@/components/coreshop-spec/coreshop-spec.vue'; - // #ifdef H5 - import shareByH5 from '@/components/coreshop-share/shareByh5.vue'; - // #endif - // #ifdef MP-WEIXIN import shareByWx from '@/components/coreshop-share/shareByWx.vue'; - // #endif - // #ifdef MP-TOUTIAO - import shareByTt from '@/components/coreshop-share/shareByTt.vue'; - // #endif - // #ifdef MP-ALIPAY - import shareByAli from '@/components/coreshop-share/shareByAli.vue'; - // #endif - // #ifdef APP-PLUS || APP-PLUS-NVUE - import shareByApp from '@/components/coreshop-share/shareByApp.vue'; - // #endif export default { mixins: [goods, articles, commonUse, tools], components: { coreshopFab, coreshopNavbarSlot, spec, - // #ifdef H5 - shareByH5, - // #endif - // #ifdef MP-WEIXIN shareByWx, - // #endif - // #ifdef MP-TOUTIAO - shareByTt, - // #endif - // #ifdef MP-ALIPAY - shareByAli, - // #endif - // #ifdef APP-PLUS || APP-PLUS-NVUE - shareByApp - // #endif }, data() { return { @@ -539,12 +490,7 @@ shareHref() { let pages = getCurrentPages(); let page = pages[pages.length - 1]; - // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId + '&groupId=' + this.groupId; - // #endif - // #ifdef MP-ALIPAY - return this.$globalConstVars.apiBaseUrl + 'wap/' + page.__proto__.route + '?id=' + this.goodsId + '&groupId=' + this.groupId; - // #endif }, defaultSpesDesc() { return this.product.defaultSpecificationDescription; @@ -816,45 +762,6 @@ }, //在线客服,只有手机号的，请自己替换为手机号 showChat() { - // #ifdef H5 - let _this = this; - window._AIHECONG('ini', { - entId: this.config.entId, - button: false, - appearance: { - panelMobile: { - tone: '#FF7159', - sideMargin: 30, - ratio: 'part', - headHeight: 50 - } - } - }); - //传递客户信息 - window._AIHECONG('customer', { - head: _this.userInfo.avatar, - 名称: _this.userInfo.nickname, - 手机: _this.userInfo.mobile - }); - window._AIHECONG('showChat'); - // #endif - // 客服页面 - // #ifdef APP-PLUS || APP-PLUS-NVUE - this.$u.route('/pages/member/customerService/index'); - // #endif - // 头条系客服 - // #ifdef MP-TOUTIAO - if (this.shopMobile != 0) { - let _this = this; - tt.makePhoneCall({ - phoneNumber: this.shopMobile.toString(), - success(res) { }, - fail(res) { } - }); - } else { - _this.$u.toast('暂无设置客服电话'); - } - // #endif }, //获取分享URL getShareUrl() { diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.vue index 73d8737..849f4da 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/pinTuan/details/details.vue @@ -317,22 +317,8 @@ - - - - - + - - - - - - - - - -
@@ -383,18 +369,11 @@ - - - - - - - + + - @@ -512,42 +491,14 @@ import coreshopNavbarSlot from '@/components/coreshop-navbar-slot/coreshop-navbar-slot.vue'; import { goods, articles, commonUse, tools } from '@/common/mixins/mixinsHelper.js' import spec from '@/components/coreshop-spec/coreshop-spec.vue'; - // #ifdef H5 - import shareByH5 from '@/components/coreshop-share/shareByh5.vue'; - // #endif - // #ifdef MP-WEIXIN import shareByWx from '@/components/coreshop-share/shareByWx.vue'; - // #endif - // #ifdef MP-TOUTIAO - import shareByTt from '@/components/coreshop-share/shareByTt.vue'; - // #endif - // #ifdef MP-ALIPAY - import shareByAli from '@/components/coreshop-share/shareByAli.vue'; - // #endif - // #ifdef APP-PLUS || APP-PLUS-NVUE - import shareByApp from '@/components/coreshop-share/shareByApp.vue'; - // #endif export default { mixins: [goods, articles, commonUse, tools], components: { coreshopFab, coreshopNavbarSlot, spec, - // #ifdef H5 - shareByH5, - // #endif - // #ifdef MP-WEIXIN shareByWx, - // #endif - // #ifdef MP-TOUTIAO - shareByTt, - // #endif - // #ifdef MP-ALIPAY - shareByAli, - // #endif - // #ifdef APP-PLUS || APP-PLUS-NVUE - shareByApp - // #endif }, data() { return { @@ -680,12 +631,7 @@ shareHref() { let pages = getCurrentPages(); let page = pages[pages.length - 1]; - // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId + '&pinTuanId=' + this.pinTuanId; - // #endif - // #ifdef MP-ALIPAY - return this.$globalConstVars.apiBaseUrl + 'wap/' + page.__proto__.route + '?id=' + this.goodsId + '&pinTuanId=' + this.pinTuanId; - // #endif }, defaultSpesDesc() { return this.product.defaultSpecificationDescription; @@ -970,45 +916,6 @@ }, //在线客服,只有手机号的，请自己替换为手机号 showChat() { - // #ifdef H5 - let _this = this; - window._AIHECONG('ini', { - entId: this.config.entId, - button: false, - appearance: { - panelMobile: { - tone: '#FF7159', - sideMargin: 30, - ratio: 'part', - headHeight: 50 - } - } - }); - //传递客户信息 - window._AIHECONG('customer', { - head: _this.userInfo.avatar, - 名称: _this.userInfo.nickname, - 手机: _this.userInfo.mobile - }); - window._AIHECONG('showChat'); - // #endif - // 客服页面 - // #ifdef APP-PLUS || APP-PLUS-NVUE - this.$u.route('/pages/member/customerService/index'); - // #endif - // 头条系客服 - // #ifdef MP-TOUTIAO - if (this.shopMobile != 0) { - let _this = this; - tt.makePhoneCall({ - phoneNumber: this.shopMobile.toString(), - success(res) { }, - fail(res) { } - }); - } else { - _this.$u.toast('暂无设置客服电话'); - } - // #endif }, //获取分享URL getShareUrl() { diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue index ac279e6..19e9b94 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/activity/seckill/details/details.vue @@ -148,22 +148,8 @@ - - - - - - - - - - - - - - - - + + @@ -345,18 +331,11 @@ - - - - - - - + + - @@ -384,42 +363,15 @@ import { goods, articles, commonUse, tools } from '@/common/mixins/mixinsHelper.js' import spec from '@/components/coreshop-spec/coreshop-spec.vue'; import coreshopNavbarSlot from '@/components/coreshop-navbar-slot/coreshop-navbar-slot.vue'; - // #ifdef H5 - import shareByH5 from '@/components/coreshop-share/shareByh5.vue'; - // #endif - // #ifdef MP-WEIXIN import shareByWx from '@/components/coreshop-share/shareByWx.vue'; - // #endif - // #ifdef MP-TOUTIAO - import shareByTt from '@/components/coreshop-share/shareByTt.vue'; - // #endif - // #ifdef MP-ALIPAY - import shareByAli from '@/components/coreshop-share/shareByAli.vue'; - // #endif - // #ifdef APP-PLUS || APP-PLUS-NVUE - import shareByApp from '@/components/coreshop-share/shareByApp.vue'; - // #endif + export default { mixins: [goods, articles, commonUse, tools], components: { coreshopFab, coreshopNavbarSlot, spec, - // #ifdef H5 - shareByH5, - // #endif - // #ifdef MP-WEIXIN shareByWx, - // #endif - // #ifdef MP-TOUTIAO - shareByTt, - // #endif - // #ifdef MP-ALIPAY - shareByAli, - // #endif - // #ifdef APP-PLUS || APP-PLUS-NVUE - shareByApp - // #endif }, data() { return { @@ -544,12 +496,7 @@ shareHref() { let pages = getCurrentPages(); let page = pages[pages.length - 1]; - // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId + '&groupId=' + this.groupId; - // #endif - // #ifdef MP-ALIPAY - return this.$globalConstVars.apiBaseUrl + 'wap/' + page.__proto__.route + '?id=' + this.goodsId + '&groupId=' + this.groupId; - // #endif }, defaultSpesDesc() { return this.product.defaultSpecificationDescription; @@ -820,45 +767,6 @@ }, //在线客服,只有手机号的，请自己替换为手机号 showChat() { - // #ifdef H5 - let _this = this; - window._AIHECONG('ini', { - entId: this.config.entId, - button: false, - appearance: { - panelMobile: { - tone: '#FF7159', - sideMargin: 30, - ratio: 'part', - headHeight: 50 - } - } - }); - //传递客户信息 - window._AIHECONG('customer', { - head: _this.userInfo.avatar, - 名称: _this.userInfo.nickname, - 手机: _this.userInfo.mobile - }); - window._AIHECONG('showChat'); - // #endif - // 客服页面 - // #ifdef APP-PLUS || APP-PLUS-NVUE - this.$u.route('/pages/member/customerService/index'); - // #endif - // 头条系客服 - // #ifdef MP-TOUTIAO - if (this.shopMobile != 0) { - let _this = this; - tt.makePhoneCall({ - phoneNumber: this.shopMobile.toString(), - success(res) { }, - fail(res) { } - }); - } else { - _this.$u.toast('暂无设置客服电话'); - } - // #endif }, //获取分享URL getShareUrl() { diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.scss b/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.scss index 82a4615..0dfbf9f 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.scss +++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.scss @@ -1,4 +1,4 @@ -.topBox { position: sticky; z-index: 1; width: 100%; /* #ifdef APP-PLUS */ top: calc(var(--status-bar-height) + 70rpx); /* #endif */ /* #ifdef H5 */ top: calc(var(--status-bar-height) + 110rpx); /* #endif */ /* #ifdef MP */ top: calc(var(--status-bar-height) + 135rpx); /* #endif */ } +.topBox { position: sticky; z-index: 1; width: 100%; /* #ifdef MP */ top: calc(var(--status-bar-height) + 135rpx); /* #endif */ } .good_box { border-radius: 8px; margin: 5px; background-color: #ffffff; padding: 5px; position: relative; width: calc(100% - 6px); } .good_image { width: 100%; border-radius: 4px; } diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue index 1efb791..f8d92ac 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/category/list/list.vue @@ -501,7 +501,6 @@ goSearch() { let pages = getCurrentPages(); let prevPage = pages[pages.length - 2]; - // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE || MP-TOUTIAO if (prevPage && prevPage.route) { let search_flag = prevPage.route; if (search_flag == 'pages/search/search') { @@ -514,22 +513,6 @@ } else { this.$u.route('/pages/search/search'); } - // #endif - - // #ifdef MP-ALIPAY - if (prevPage && prevPage.__proto__.route) { - let search_flag = prevPage.__proto__.route; - if (search_flag == 'pages/search/search') { - uni.navigateBack({ - delta: 1 - }); - } else { - this.$u.route('/pages/search/search'); - } - } else { - this.$u.route('/pages/search/search'); - } - // #endif }, //取消筛选 filterNo() { @@ -636,21 +619,7 @@ closeDropdown() { this.$refs.uDropdown.close(); } - }, - // #ifdef MP-ALIPAY - onChangeShowState_show: function () { - var that = this; - that.setData({ - showView: (that.showView = true) - }); - }, - onChangeShowState_hid: function () { - var that = this; - that.setData({ - showView: (that.showView = false) - }); } - // #endif }; diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue index 122905f..e2dc6b9 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/goods/goodDetails/goodDetails.vue @@ -200,22 +200,8 @@ - - - - - + - - - - - - - - - -
@@ -287,18 +273,11 @@ - - - - - - - - @@ -400,42 +379,15 @@ import { goods, articles, commonUse, tools } from '@/common/mixins/mixinsHelper.js' import coreshopNavbarSlot from '@/components/coreshop-navbar-slot/coreshop-navbar-slot.vue'; import spec from '@/components/coreshop-spec/coreshop-spec.vue' - // #ifdef H5 - import shareByH5 from '@/components/coreshop-share/shareByh5.vue' - // #endif - // #ifdef MP-WEIXIN - import shareByWx from '@/components/coreshop-share/shareByWx.vue' - // #endif - // #ifdef MP-TOUTIAO - import shareByTt from '@/components/coreshop-share/shareByTt.vue' - // #endif - // #ifdef MP-ALIPAY - import shareByAli from '@/components/coreshop-share/shareByAli.vue' - // #endif - // #ifdef APP-PLUS || APP-PLUS-NVUE - import shareByApp from '@/components/coreshop-share/shareByApp.vue' - // #endif + import shareByWx from '@/components/coreshop-share/shareByWx.vue'; + export default { mixins: [goods, articles, commonUse, tools], components: { coreshopFab, coreshopNavbarSlot, spec, - // #ifdef H5 - shareByH5, - // #endif - // #ifdef MP-WEIXIN shareByWx, - // #endif - // #ifdef MP-TOUTIAO - shareByTt, - // #endif - // #ifdef MP-ALIPAY - shareByAli, - // #endif - // #ifdef APP-PLUS || APP-PLUS-NVUE - shareByApp, - // #endif }, data() { return { @@ -495,13 +447,11 @@ if (res.status) { _this.userInfo = res.data _this.hasLogin = true; - // #ifdef MP-WEIXIN //微信小程序打开客服时，传递用户信息 var kefupara = {} kefupara.nickName = res.data.nickname kefupara.tel = res.data.mobile _this.kefupara = JSON.stringify(kefupara) - // #endif } }) }; @@ -571,12 +521,7 @@ shareHref() { let pages = getCurrentPages() let page = pages[pages.length - 1] - // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE return this.$globalConstVars.apiBaseUrl + 'wap/' + page.route + '?id=' + this.goodsId; - // #endif - // #ifdef MP-ALIPAY - return this.$globalConstVars.apiBaseUrl + 'wap/' + page.__proto__.route + '?id=' + this.goodsId; - // #endif }, defaultSpesDesc() { return this.product.defaultSpecificationDescription; @@ -874,45 +819,6 @@ }, //在线客服,只有手机号的，请自己替换为手机号 showChat() { - let _this = this; - // #ifdef H5 - window._AIHECONG('ini', { - entId: this.config.entId, - button: false, - appearance: { - panelMobile: { - tone: '#FF7159', - sideMargin: 30, - ratio: 'part', - headHeight: 50 - } - } - }) - //传递客户信息 - window._AIHECONG('customer', { - head: _this.userInfo.avatar, - '名称': _this.userInfo.nickname, - '手机': _this.userInfo.mobile - }) - window._AIHECONG('showChat') - // #endif - // 客服页面 - // #ifdef APP-PLUS || APP-PLUS-NVUE - this.$u.route('/pages/member/customerService/index'); - // #endif - // 头条系客服 - // #ifdef MP-TOUTIAO - if (this.shopMobile != 0) { - let _this = this; - tt.makePhoneCall({ - phoneNumber: this.shopMobile.toString(), - success(res) { }, - fail(res) { } - }); - } else { - _this.$u.toast('暂无设置客服电话'); - } - // #endif }, //获取分享URL getShareUrl() { diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/index/custom/custom.vue b/CoreCms.Net.Uni-App/CoreShop/pages/index/custom/custom.vue index 452c63f..9be2aca 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/index/custom/custom.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/custom/custom.vue @@ -13,22 +13,9 @@ - - - - - - - - - - - - - diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue b/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue index e56df65..53c2af6 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/default/default.vue @@ -13,22 +13,9 @@ - - - - - - - - - - - - - @@ -181,47 +168,6 @@ }, //在线客服,只有手机号的，请自己替换为手机号 showChat() { - // #ifdef H5 - let _this = this; - window._AIHECONG('ini', { - entId: this.$store.state.config.entId, - button: false, - appearance: { - panelMobile: { - tone: '#FF7159', - sideMargin: 30, - ratio: 'part', - headHeight: 50 - } - } - }); - //传递客户信息 - window._AIHECONG('customer', { - head: _this.userInfo.avatarImage, - 名称: _this.userInfo.nickName, - 手机: _this.userInfo.mobile - }); - window._AIHECONG('showChat'); - // #endif - - // 客服页面 - // #ifdef APP-PLUS || APP-PLUS-NVUE - this.$u.route('/pages/member/customerService/index'); - // #endif - - // 头条系客服 - // #ifdef MP-TOUTIAO - if (this.shopMobile != 0) { - let _this = this; - tt.makePhoneCall({ - phoneNumber: this.shopMobile.toString(), - success(res) { }, - fail(res) { } - }); - } else { - _this.$u.toast('暂无设置客服电话'); - } - // #endif }, //获取分享URL getShareUrl() { diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue b/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue index 89c6d2c..b69bfde 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/index/member/member.vue @@ -10,32 +10,12 @@ - - - - - - - - - - - @@ -194,33 +163,15 @@ 其他 - 帮助中心 - {{ item.name }} - - - - 联系客服 - - - - - - - - - - - - @@ -473,9 +424,6 @@ goLogin() { this.$store.commit('showLoginTip', true); }, - toLogin() { - this.$u.route('/pages/member/login/login/loginByAccount') - }, initData() { var _this = this //判断是开启分销还是原始推广 @@ -562,24 +510,6 @@ }, //在线客服,只有手机号的，请自己替换为手机号 showChat() { - // #ifdef H5 - // #endif - // #ifdef APP-PLUS || APP-PLUS-NVUE - this.$u.route('/pages/member/customerService/index'); - // #endif - // 头条系客服 - // #ifdef MP-TOUTIAO - if (this.shopMobile != 0) { - let _this = this; - tt.makePhoneCall({ - phoneNumber: this.shopMobile.toString(), - success(res) { }, - fail(res) { } - }); - } else { - _this.$u.toast('暂无设置客服电话'); - } - // #endif }, //同步微信昵称数据 syncWeChatInfo() { diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/login/forget/forget.vue b/CoreCms.Net.Uni-App/CoreShop/pages/login/forget/forget.vue deleted file mode 100644 index 9d1c979..0000000 --- a/CoreCms.Net.Uni-App/CoreShop/pages/login/forget/forget.vue +++ /dev/null @@ -1,203 +0,0 @@ - - - - - diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/login/loginByAccount/loginByAccount.vue b/CoreCms.Net.Uni-App/CoreShop/pages/login/loginByAccount/loginByAccount.vue deleted file mode 100644 index 61d65c7..0000000 --- a/CoreCms.Net.Uni-App/CoreShop/pages/login/loginByAccount/loginByAccount.vue +++ /dev/null @@ -1,309 +0,0 @@ - - - - - diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.scss b/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.scss deleted file mode 100644 index 28df07a..0000000 --- a/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.scss +++ /dev/null @@ -1,38 +0,0 @@ -.wrap { font-size: 28rpx; - .content { width: 600rpx; margin: 80rpx auto 0; - - .title { text-align: left; font-size: 50rpx; font-weight: 500; margin-bottom: 100rpx; } - input { text-align: left; margin-bottom: 10rpx; padding-bottom: 6rpx; } - .tips { color: $u-type-info; margin-bottom: 60rpx; margin-top: 8rpx; } - .getCaptcha { background-color: rgb(253, 243, 208); color: $u-tips-color; border: none; font-size: 30rpx; padding: 12rpx 0; - - &::after { border: none; } - } - .alternative { color: $u-tips-color; display: flex; justify-content: space-between; margin-top: 30rpx; } - } - .buttom { - .loginType { display: flex; padding: 350rpx 150rpx 150rpx 150rpx; justify-content: center; - - .item { display: flex; flex-direction: column; align-items: center; color: $u-content-color; font-size: 28rpx; } - } - - .hint { padding: 20rpx 40rpx; font-size: 22rpx; color: $u-tips-color; - - .link { color: $u-type-warning; } - } - } -} - - -.wrapkey { padding: 80rpx 70rpx; } -.box { margin: 30rpx 0; font-size: 30rpx; color: 555; } -.key-input { padding: 30rpx 0; - text { display: none; } - .error { display: block; color: red; font-size: 30rpx; margin: 20rpx 0; } -} -.title { font-size: 50rpx; color: #333; } -.key-input .tips { font-size: 30rpx; color: #333; margin-top: 20rpx; margin-bottom: 60rpx; } -.captcha { color: $u-type-warning; font-size: 30rpx; margin-top: 40rpx; - .noCaptcha { display: block; } - .regain { display: block; } -} diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.vue b/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.vue deleted file mode 100644 index 9fd9b0c..0000000 --- a/CoreCms.Net.Uni-App/CoreShop/pages/login/loginBySMS/loginBySMS.vue +++ /dev/null @@ -1,365 +0,0 @@ - - - - - diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue index ad4e5eb..f530a1e 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/address/list/list.vue @@ -69,18 +69,8 @@ let pages = getCurrentPages();//当前页 let beforePage = pages[pages.length - 2];//上个页面 - // #ifdef MP-ALIPAY || MP-TOUTIAO - this.$db.set('addressUserShip', data, true); - // #endif - - // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE - this.$store.commit("userShip", data) - // #endif - - // #ifdef MP-WEIXIN beforePage.$vm.userShip = data; beforePage.$vm.params.areaId = data.areaId; - // #endif uni.navigateBack({ delta: 1 diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.scss index 4f15d17..435c84e 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.scss +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.scss @@ -16,13 +16,6 @@ .cell-header { padding: 10rpxpx 0; margin: 0; margin-left: 20rpx; font-size: 28rpx; font-weight: 550; } .mr5 { margin-right: 10rpx; } .inputStyle { display: inline-block; border: 2rpx solid #ccc; height: 13rpx; line-height: 13rpx; width: 60rpx; text-align: center; font-size: 24rpx; vertical-align: middle; } -/* #ifdef MP-ALIPAY */ - -/* #endif */ -/* #ifdef MP-TOUTIAO */ -.goods-item-c { height: 1.5rem; } -.goods-buy { height: 100%; } -/* #endif */ .refund-price { border-bottom: none; } .refund-tip { padding: 0 26rpx 10rpx; text-align: right; } @@ -42,4 +35,4 @@ uni-checkbox.checkboxNo .uni-checkbox-input { background-color: #e1e1e1 !important; border-color: #e1e1e1 !important; } -.icon { width: 50upx; height: 50upx; /* #ifdef MP-ALIPAY */ background-size: 100% 100%; /* #endif */ } +.icon { width: 50upx; height: 50upx; } diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue index f62b873..072da8c 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/afterSales/submit/submit.vue @@ -64,7 +64,6 @@ - - - - - - - diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue index ab3a535..eac3dda 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/myStore/myStore.vue @@ -15,26 +15,9 @@ {{totalGoods}} 全部宝贝 - - - - - - - - - - - - - - - - - @@ -44,15 +27,7 @@ - - - - - 请将此页面添加浏览器书签 - 方便下次浏览 - - @@ -148,18 +123,8 @@ this.getGoods(); }, mounted() { - // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE - window.addEventListener('scroll', this.handleScroll) - // #endif }, updated() { - // #ifndef MP-WEIXIN || MP-TOUTIAO || MP-ALIPAY - // 获取上半部分的整体高度 - this.$nextTick(() => { - let h = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight; //浏览器高度 - this.top_height = this.$refs.myStore.$el.clientHeight; - }) - // #endif }, methods: { // 显示modal弹出框 @@ -174,7 +139,6 @@ goSearch() { let pages = getCurrentPages(); let prevPage = pages[pages.length - 2]; - // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE || MP-TOUTIAO if (prevPage && prevPage.route) { let search_flag = prevPage.route; if (search_flag == 'pages/search/search') { @@ -187,21 +151,6 @@ } else { this.$u.route('/pages/search/search'); } - // #endif - // #ifdef MP-ALIPAY - if (prevPage && prevPage.__proto__.route) { - let search_flag = prevPage.__proto__.route; - if (search_flag == 'pages/search/search') { - uni.navigateBack({ - delta: 1 - }); - } else { - this.$u.route('/pages/search/search'); - } - } else { - this.$u.route('/pages/search/search'); - } - // #endif }, //取得商品数据 @@ -265,25 +214,7 @@ page: 11, } let pageUrl = 'pages/share/jump/jump'; - // #ifdef H5 - data.client = 1; - data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl; - // #endif - // #ifdef MP-WEIXIN data.client = 2; - data.url = pageUrl; - // #endif - // #ifdef MP-ALIPAY - data.client = 3; - data.url = pageUrl; - // #endif - // #ifdef APP-PLUS || APP-PLUS-NVUE - data.client = 5; - data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl; - // #endif - // #ifdef MP-TOUTIAO - data.client = 6; - // #endif let userToken = this.$db.get('userToken') if (userToken && userToken != '') { data.token = userToken diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue index 80affef..1485399 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/agent/panel/panel.vue @@ -184,25 +184,8 @@ page: 11, } let pageUrl = 'pages/share/jump/jump'; - // #ifdef H5 - data.client = 1; - data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl; - // #endif - // #ifdef MP-WEIXIN data.client = 2; - data.url = pageUrl; - // #endif - // #ifdef MP-ALIPAY - data.client = 3; - data.url = pageUrl; - // #endif - // #ifdef APP-PLUS || APP-PLUS-NVUE - data.client = 5; - data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl; - // #endif - // #ifdef MP-TOUTIAO - data.client = 6; - // #endif + let userToken = this.$db.get('userToken') if (userToken && userToken != '') { data.token = userToken diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard/bankcard.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard/bankcard.vue index 556741d..4972205 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard/bankcard.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/bankcard/bankcard.vue @@ -121,17 +121,7 @@ let pages = getCurrentPages();//当前页 let beforePage = pages[pages.length - 2];//上个页面 - // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE - beforePage.cardInfo = this.cards[index] - // #endif - - // #ifdef MP-WEIXIN beforePage.$vm.cardInfo = this.cards[index] - // #endif - - // #ifdef MP-ALIPAY || MP-TOUTIAO - this.$db.set('userCardInfo', this.cards[index], true); - // #endif uni.navigateBack({ delta: 1 diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.scss b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.scss index ebbafd2..95b8b37 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.scss +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.scss @@ -4,8 +4,4 @@ .withdrawcash-input { display: flex; align-items: center; font-size: 50upx; border-bottom: 2upx solid #e8e8e8; padding-bottom: 20upx; width: 95%; max-width: 95%; text { font-size: 40upx; } input { display: inline-block; min-width: 500upx; padding-left: 20upx; } -} - -/* #ifdef MP-ALIPAY */ -.coreshop-cell-hd-title input { font-size: 24px; height: 18px; } -/* #endif */ +} \ No newline at end of file diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.vue index 0a2640d..4e2b5aa 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/balance/withdrawCash/withdrawCash.vue @@ -75,13 +75,6 @@ this.userInfo() }, onShow() { - // #ifdef MP-ALIPAY || MP-TOUTIAO - let userCardInfo = this.$db.get('userCardInfo', true); - if (userCardInfo) { - this.cardInfo = userCardInfo; - this.$db.del('userCardInfo', true); - } - // #endif }, computed: { userbankCard() { diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue index 07dc362..90470ff 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/myStore/myStore.vue @@ -15,26 +15,9 @@ {{totalGoods}} 全部宝贝 - - - - - - - - - - - - - - - - - @@ -45,15 +28,7 @@ - - - - - 请将此页面添加浏览器书签 - 方便下次浏览 - - @@ -148,18 +123,8 @@ this.getGoods(); }, mounted() { - // #ifdef H5 || APP-PLUS || APP-PLUS-NVUE - window.addEventListener('scroll', this.handleScroll) - // #endif }, updated() { - // #ifndef MP-WEIXIN || MP-TOUTIAO || MP-ALIPAY - // 获取上半部分的整体高度 - this.$nextTick(() => { - let h = window.innerHeight || document.documentElement.clientHeight || document.body.clientHeight; //浏览器高度 - this.top_height = this.$refs.myStore.$el.clientHeight; - }) - // #endif }, methods: { // 显示modal弹出框 @@ -174,7 +139,6 @@ goSearch() { let pages = getCurrentPages(); let prevPage = pages[pages.length - 2]; - // #ifdef H5 || MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE || MP-TOUTIAO if (prevPage && prevPage.route) { let search_flag = prevPage.route; if (search_flag == 'pages/search/search') { @@ -187,21 +151,6 @@ } else { this.$u.route('/pages/search/search'); } - // #endif - // #ifdef MP-ALIPAY - if (prevPage && prevPage.__proto__.route) { - let search_flag = prevPage.__proto__.route; - if (search_flag == 'pages/search/search') { - uni.navigateBack({ - delta: 1 - }); - } else { - this.$u.route('/pages/search/search'); - } - } else { - this.$u.route('/pages/search/search'); - } - // #endif }, //取得商品数据 @@ -266,25 +215,8 @@ let pages = getCurrentPages() let page = pages[pages.length - 1] let pageUrl = 'pages/share/jump/jump'; - // #ifdef H5 - data.client = 1; - data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl; - // #endif - // #ifdef MP-WEIXIN data.client = 2; - data.url = pageUrl; - // #endif - // #ifdef MP-ALIPAY - data.client = 3; - data.url = pageUrl; - // #endif - // #ifdef APP-PLUS || APP-PLUS-NVUE - data.client = 5; - data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl; - // #endif - // #ifdef MP-TOUTIAO - data.client = 6; - // #endif + let userToken = this.$db.get('userToken') if (userToken && userToken != '') { data.token = userToken diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue index 455e1e5..68f1c8b 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/distribution/panel/panel.vue @@ -183,25 +183,8 @@ page: 4, } let pageUrl = 'pages/share/jump/jump'; - // #ifdef H5 - data.client = 1; - data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl; - // #endif - // #ifdef MP-WEIXIN data.client = 2; - data.url = pageUrl; - // #endif - // #ifdef MP-ALIPAY - data.client = 3; - data.url = pageUrl; - // #endif - // #ifdef APP-PLUS || APP-PLUS-NVUE - data.client = 5; - data.url = this.$globalConstVars.apiBaseUrl + 'wap/' + pageUrl; - // #endif - // #ifdef MP-TOUTIAO - data.client = 6; - // #endif + let userToken = this.$db.get('userToken') if (userToken && userToken != '') { data.token = userToken diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/index.vue b/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/index.vue index 6e8d75c..ccde8d7 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/index.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/member/invite/index.vue @@ -27,16 +27,9 @@ 提交 - - - - - @@ -46,10 +39,7 @@ diff --git a/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.vue b/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.vue index 26151b9..c89c530 100644 --- a/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.vue +++ b/CoreCms.Net.Uni-App/CoreShop/pages/payment/pay/pay.vue @@ -84,21 +84,7 @@ - - - - - - - - - - - - - - @@ -110,25 +96,7 @@