diff --git a/App.vue b/App.vue index 718ad31..b4fd31e 100644 --- a/App.vue +++ b/App.vue @@ -45,7 +45,7 @@ is_phone_login: 0, auto_arrival: 0, mer_location: 0, - statusBarHeight:0, + statusBarHeight: 0, mer_location: 0, store_street_theme: 1, sys_intention_agree: '', @@ -132,38 +132,40 @@ //#endif }; // #ifndef H5 - setTimeout(()=>{ - if(that.globalData.copy_command_status == 1){ + setTimeout(() => { + if (that.globalData.copy_command_status == 1) { uni.getClipboardData({ - success: function (res) { - if(/^(\/@[1-9]{1}).*\*\//.test(res.data)){ + success: function(res) { + if (/^(\/@[1-9]{1}).*\*\//.test(res.data)) { that.$store.commit("PARSE_PWD", res.data) } - },fail: function (res) { + }, + fail: function(res) { // 内容获取失败 } }) } - },1500) + }, 1500) // #endif }, methods: { randomString(len) { - //   len = len || 32; - //   var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678'; /****默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1****/ - //   var maxPos = $chars.length; - //   var pwd = ''; - //   for (var i = 0; i < len; i++) { - //     pwd += $chars.charAt(Math.floor(Math.random() * maxPos)); - //   } + //   len = len || 32; + //   var $chars = 'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678'; /****默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1****/ + //   var maxPos = $chars.length; + //   var pwd = ''; + //   for (var i = 0; i < len; i++) { + //     pwd += $chars.charAt(Math.floor(Math.random() * maxPos)); + //   } let pwd = (Date.now()).toString() uni.setStorageSync('uuid', pwd) -   return pwd; + return pwd; }, setOpenShare: function(data) { let that = this; let href = location.href; - href = href.indexOf("?") === -1 ? href + "?spid=" + this.globalData.uid : href + "&spid=" + this.globalData.uid; + href = href.indexOf("?") === -1 ? href + "?spid=" + this.globalData.uid : href + "&spid=" + this + .globalData.uid; if (that.$wechat.isWeixin()) { let configAppMessage = { desc: data.share_info, @@ -171,11 +173,12 @@ link: href, imgUrl: data.share_pic }; - that.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"], configAppMessage); + that.$wechat.wechatEvevt(["updateAppMessageShareData", "updateTimelineShareData"], + configAppMessage); } }, // 获取配置 - getConfigData(){ + getConfigData() { getconfig().then(res => { uni.$emit('update', res.data) this.$store.commit('GLOBAL_DATA', res.data); @@ -212,13 +215,13 @@ this.globalData.community_reply_auth = res.data.community_reply_auth this.globalData.margin_ico_switch = res.data.margin_ico_switch this.globalData.first_avatar_switch = res.data.first_avatar_switch - this.globalData.wechat_phone_switch = res.data.wechat_phone_switch + this.globalData.wechat_phone_switch = res.data.wechat_phone_switch this.$Cache.set('BIND_PHONE', res.data.wechat_phone_switch) //是否开启强制绑定手机号 this.globalData.margin_ico = res.data.margin_ico this.globalData.community_auth = res.data.community_auth this.$Cache.set('WECHAT_APPID', res.data.wechat_config_appid) this.$store.commit("VIEW_COLOR", res.data.global_theme.theme) - this.$store.commit("KEY_COLOR",'_' + res.data.global_theme.type) + this.$store.commit("KEY_COLOR", '_' + res.data.global_theme.type) try { uni.setStorageSync('SUBSCRIBE_MESSAGE', res.data.tempid); } catch (e) { @@ -247,20 +250,25 @@ } + \ No newline at end of file diff --git a/androidPrivacy.json b/androidPrivacy.json index 8b67533..dc05560 100644 --- a/androidPrivacy.json +++ b/androidPrivacy.json @@ -2,7 +2,7 @@ "version" : "1", "prompt" : "template", "title" : "服务协议与隐私政策", - "message" : "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款,包括但不限于:为了 向你提供即时通讯、内容分享等服务,我 们需要收集你的设备信息、操作日志等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。
\r\r + "message" : "\t请务必审慎阅读、充分理解“服务协议与 隐私政策”各条款,包括但不限于:为了 向你提供即时通讯、内容分享等服务,我 们需要收集你的设备信息、操作日志等个 人信息。你可以在“设置”中查看、变更、删除个人信息并管理你的授权。
\r\r\r \t你可以阅读 《用户协议》《隐私政策》了解详细信息。如你同意,请点击“我同意”开始接受我们的服务。", "buttonAccept" : "同意并接受", "buttonRefuse" : "暂不同意", diff --git a/api/article.js b/api/article.js new file mode 100644 index 0000000..4b4dbc1 --- /dev/null +++ b/api/article.js @@ -0,0 +1,26 @@ +// import request from "@/utils/request.js"; +import request from "@/utils/request.js"; +// import http from "@/utils/http.js"; +// export const postShopInfo = (params, config = {}) => request.post('/edcapi/Shop_shopDeatil', params, config) +// // get请求,获取菜单,注意:get请求的配置等,都在第二个参数中,详见前面解释 +/** + * + */ + + +export const getArea = (data) => request.get('city/get_area', data, { + noAuth: true +}) +export const getStreet = (data) => request.get('city/get_street', data, { + noAuth: true +}) +export const getVillage = (data) => request.get('city/get_village', data, { + noAuth: true +}) +export const getbrigadeAPI = (data) => request.get('common/get_brigade', data, { + noAuth: true +}) +export const postBindingAPI = (data) => request.post('Userinfo/Binding', data, { + noAuth: true, + noVerify: true +}) \ No newline at end of file diff --git a/libs/login.js b/libs/login.js index 4c9a141..7de70ab 100644 --- a/libs/login.js +++ b/libs/login.js @@ -47,38 +47,38 @@ export function toLogin(push, pathLogin) { } // #endif if (!pathLogin) - pathLogin = '/page/users/login/index' + pathLogin = '/page/users/login/login_copy' Cache.set('login_back_url', path); // #ifdef H5 if (isWeixin()) { - if(Cache.get('WECHAT_APPID')){ + if (Cache.get('WECHAT_APPID')) { uni.navigateTo({ url: '/pages/users/wechat_login/index', }); - }else{ + } else { return uni.navigateTo({ - url:'/pages/users/login/index' + url: '/pages/users/login/login_copy' }) - } - } else { - if (path !== pathLogin) { - push ? uni.navigateTo({ - url: '/pages/users/login/index' - }) : uni.reLaunch({ - url: '/pages/users/login/index' - }); - } } - // #endif - // #ifdef MP - let url - uni.navigateTo({ - url: '/pages/users/wechat_login/index' - }) - // #endif + } else { + if (path !== pathLogin) { + push ? uni.navigateTo({ + url: '/pages/users/login/login_copy' + }) : uni.reLaunch({ + url: '/pages/users/login/login_copy' + }); + } + } + // #endif + // #ifdef MP + let url + uni.navigateTo({ + url: '/pages/users/wechat_login/index' + }) + // #endif // #ifdef APP-PLUS uni.navigateTo({ - url: '/pages/users/login/index', + url: '/pages/users/login/login_copy', }) // #endif } @@ -101,4 +101,4 @@ export function checkLogin() { return true; } -} +} \ No newline at end of file diff --git a/main.js b/main.js index 67608a7..a2c4f3f 100644 --- a/main.js +++ b/main.js @@ -12,7 +12,9 @@ import App from './App' import store from './store' import Cache from './utils/cache' import util from 'utils/util' -import { HTTP_REQUEST_URL } from '@/config/app'; +import { + HTTP_REQUEST_URL +} from '@/config/app'; import skeleton from './components/skeleton/index.vue' import BaseMoney from './components/BaseMoney.vue'; Vue.component('skeleton', skeleton) @@ -20,15 +22,23 @@ Vue.component('BaseMoney', BaseMoney) Vue.prototype.$util = util; Vue.prototype.$Cache = Cache; Vue.prototype.$eventHub = new Vue(); -Vue.config.productionTip = false +Vue.config.productionTip = false; + +// 引入组件库uview +import uView from "uview-ui"; +Vue.use(uView); // #ifdef H5 -import { parseQuery } from "./utils"; +import { + parseQuery +} from "./utils"; import Auth from './libs/wechat'; -import { SPREAD } from './config/cache'; +import { + SPREAD +} from './config/cache'; // import wx from '@/node_modules/jweixin-module/lib/index' var __s = document.createElement('script'); -__s.src=HTTP_REQUEST_URL+"/api/script"; +__s.src = HTTP_REQUEST_URL + "/api/script"; document.head.appendChild(__s); Vue.prototype.$wechat = Auth; let cookieName = "VCONSOLE", @@ -49,8 +59,8 @@ if (urlSpread !== undefined) { } if (vconsole !== undefined) { - if (vconsole === md5UnCrmeb && Cache.has(cookieName)) - Cache.clear(cookieName); + if (vconsole === md5UnCrmeb && Cache.has(cookieName)) + Cache.clear(cookieName); } else vconsole = Cache.get(cookieName); import VConsole from './components/vconsole.min.js' @@ -58,22 +68,22 @@ import VConsole from './components/vconsole.min.js' if (vconsole !== undefined && vconsole === md5Crmeb) { Cache.set(cookieName, md5Crmeb, 3600); let vConsole = new VConsole(); - + } // 注册全局防抖指令 -Vue.directive('debounce',{ - inserted:(el,binding)=>{ - let debounceTime = binding.value || 2000 - let timer - el.addEventListener('click',e=>{ - el.style.pointerEvents = 'none'; - if(!el.disabled){ - timer = setTimeout(()=>{ - el.style.pointerEvents = 'auto' - },debounceTime) - } - },true) - } +Vue.directive('debounce', { + inserted: (el, binding) => { + let debounceTime = binding.value || 2000 + let timer + el.addEventListener('click', e => { + el.style.pointerEvents = 'none'; + if (!el.disabled) { + timer = setTimeout(() => { + el.style.pointerEvents = 'auto' + }, debounceTime) + } + }, true) + } }) // if(!!!Auth.isAndroid() && Auth.isWeixin()){ @@ -88,7 +98,7 @@ App.mpType = 'app' const app = new Vue({ - ...App, + ...App, store, Cache }) diff --git a/manifest.json b/manifest.json index f7795e6..9505360 100644 --- a/manifest.json +++ b/manifest.json @@ -80,7 +80,8 @@ "NSLocationWhenInUseUsageDescription" : "根据客户地理位置推荐最近门店", "NSLocationAlwaysUsageDescription" : "根据客户地理位置推荐最近门店" }, - "idfa" : false + "idfa" : false, + "dSYMs" : false }, /* SDK配置 */ "sdkConfigs" : { diff --git a/package-lock.json b/package-lock.json index f372aa3..57e91b1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,440 +1,24 @@ { + "name": "new_shop_app", + "lockfileVersion": 2, "requires": true, - "lockfileVersion": 1, + "packages": { + "": { + "dependencies": { + "uview-ui": "^1.8.8" + } + }, + "node_modules/uview-ui": { + "version": "1.8.8", + "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.8.tgz", + "integrity": "sha512-Osal3yzXiHor0In9OPTZuXTaqTbDglMZ9RGK/MPYDoQQs+y0hrBCUD0Xp5T70C8i2lLu2X6Z11zJhmsQWMR7Jg==" + } + }, "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "dev": true, - "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" - } - }, - "babel-core": { - "version": "6.26.3", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz", - "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", - "dev": true, - "requires": { - "babel-code-frame": "^6.26.0", - "babel-generator": "^6.26.0", - "babel-helpers": "^6.24.1", - "babel-messages": "^6.23.0", - "babel-register": "^6.26.0", - "babel-runtime": "^6.26.0", - "babel-template": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "convert-source-map": "^1.5.1", - "debug": "^2.6.9", - "json5": "^0.5.1", - "lodash": "^4.17.4", - "minimatch": "^3.0.4", - "path-is-absolute": "^1.0.1", - "private": "^0.1.8", - "slash": "^1.0.0", - "source-map": "^0.5.7" - } - }, - "babel-generator": { - "version": "6.26.1", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", - "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", - "dev": true, - "requires": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.17.4", - "source-map": "^0.5.7", - "trim-right": "^1.0.1" - } - }, - "babel-helpers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", - "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-template": "^6.24.1" - } - }, - "babel-messages": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", - "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-register": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", - "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", - "dev": true, - "requires": { - "babel-core": "^6.26.0", - "babel-runtime": "^6.26.0", - "core-js": "^2.5.0", - "home-or-tmp": "^2.0.0", - "lodash": "^4.17.4", - "mkdirp": "^0.5.1", - "source-map-support": "^0.4.15" - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - } - }, - "babel-template": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "lodash": "^4.17.4" - } - }, - "babel-traverse": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "dev": true, - "requires": { - "babel-code-frame": "^6.26.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "debug": "^2.6.8", - "globals": "^9.18.0", - "invariant": "^2.2.2", - "lodash": "^4.17.4" - } - }, - "babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" - } - }, - "babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "convert-source-map": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", - "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", - "dev": true, - "requires": { - "safe-buffer": "~5.1.1" - } - }, - "core-js": { - "version": "2.6.11", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", - "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==", - "dev": true - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "detect-indent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", - "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "dev": true, - "requires": { - "repeating": "^2.0.0" - } - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true - }, - "globals": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", - "dev": true - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "home-or-tmp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", - "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", - "dev": true, - "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.1" - } - }, - "invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "dev": true, - "requires": { - "loose-envify": "^1.0.0" - } - }, - "is-finite": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", - "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==", - "dev": true - }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", - "dev": true - }, - "jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", - "dev": true - }, - "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", - "dev": true - }, - "lodash": { - "version": "4.17.15", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz", - "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==", - "dev": true - }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dev": true, - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "^1.1.7" - } - }, - "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", - "dev": true - }, - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", - "dev": true - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - }, - "private": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", - "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", - "dev": true - }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true - }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "requires": { - "is-finite": "^1.0.0" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", - "dev": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "source-map-support": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", - "dev": true, - "requires": { - "source-map": "^0.5.6" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - }, - "to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", - "dev": true - }, - "trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", - "dev": true + "uview-ui": { + "version": "1.8.8", + "resolved": "https://registry.npmjs.org/uview-ui/-/uview-ui-1.8.8.tgz", + "integrity": "sha512-Osal3yzXiHor0In9OPTZuXTaqTbDglMZ9RGK/MPYDoQQs+y0hrBCUD0Xp5T70C8i2lLu2X6Z11zJhmsQWMR7Jg==" } } } diff --git a/package.json b/package.json new file mode 100644 index 0000000..09c8670 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "dependencies": { + "uview-ui": "^1.8.8" + } +} diff --git a/pages.json b/pages.json index 9aed057..b9e166d 100644 --- a/pages.json +++ b/pages.json @@ -1,35 +1,38 @@ { + "easycom": { + "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" + }, "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages { - "path": "pages/guide/index", - "style": { - "app-plus": { - "titleNView": false //禁用原生导航栏 - }, - "navigationStyle": "custom", + "path": "pages/guide/index", + "style": { + "app-plus": { + "titleNView": false //禁用原生导航栏 + }, + "navigationStyle": "custom", "disableScroll": true - } + } }, { "path": "pages/index/index", "style": { "navigationBarTitleText": "首页", - "navigationStyle": "custom", + "navigationStyle": "custom", // #ifdef APP-PLUS - "enablePullDownRefresh": true, + "enablePullDownRefresh": true, // #endif "app-plus": { "scrollIndicator": false //禁用原生导航栏 } } }, - { - "path": "pages/gather/gather", - "style": { - "enablePullDownRefresh": true, - "navigationBarTitleText": "工作台" - } - }, + { + "path": "pages/gather/gather", + "style": { + "enablePullDownRefresh": true, + "navigationBarTitleText": "工作台" + } + }, { "path": "pages/order_addcart/order_addcart", "style": { @@ -64,8 +67,8 @@ "path": "pages/goods_details/index", "style": { "navigationStyle": "custom" - // #ifdef MP || APP-PLUS - , + // #ifdef MP || APP-PLUS + , "navigationBarBackgroundColor": "#F2F2F2" // #endif } @@ -124,15 +127,61 @@ "style": { "navigationBarTitleText": "配送详情" } - }, - { + }, { "path": "pages/order_pay_back/index", "style": { "navigationBarTitleText": "支付提示" } + }, { + "path": "pages/helpPeople/helpPeople", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": false, + "navigationStyle": "custom", + "onReachBottomDistance": 300 + } + }, { + "path": "pages/helpPeople/formTable", + "style": { + "navigationBarTitleText": "信息收集", + "enablePullDownRefresh": false, + "navigationStyle": "custom", + "onReachBottomDistance": 300 + } } ], "subPackages": [{ + "root": "pages/cloud_warehouse", + "name": "cloud_warehouse", + "pages": [{ + "path": "big_classification/index", + "style": { + "navigationStyle": "custom", + "app-plus": { + "titleNView": false, + "bounce": "none" + } + } + }, { + "path": "small_classification/index", + "style": { + "navigationStyle": "custom", + "app-plus": { + "titleNView": false, + "bounce": "none" + } + } + }, { + "path": "select_address/index", + "style": { + "navigationStyle": "custom", + "app-plus": { + "titleNView": false, + "bounce": "none" + } + } + }] + }, { "root": "pages/users", "name": "users", "pages": [{ @@ -398,7 +447,7 @@ } }, { - "path": "login/index", + "path": "login/login_copy", "style": { "navigationBarTitleText": "登录", "navigationStyle": "custom", @@ -548,18 +597,17 @@ { "root": "pages/store", "name": "store", - "pages": [ - { - "path": "index", - "style": { - "navigationStyle": "custom", - "navigationBarTitleText": "店铺diy首页" - // #ifdef MP - , - "navigationBarTextStyle": "#FFFFFF" - // #endif - } - },{ + "pages": [{ + "path": "index", + "style": { + "navigationStyle": "custom", + "navigationBarTitleText": "店铺diy首页" + // #ifdef MP + , + "navigationBarTextStyle": "#FFFFFF" + // #endif + } + }, { "path": "home/index", "style": { "navigationStyle": "custom", @@ -567,7 +615,7 @@ // #ifdef MP , "navigationBarTextStyle": "#FFFFFF" - // #endif + // #endif } }, @@ -659,7 +707,7 @@ "navigationBarTitleText": "退款单详情" } }, - { + { "path": "delivery/index", "style": { "navigationBarTitleText": "订单发货" @@ -684,20 +732,19 @@ } } // #ifdef H5 - ,{ + , { "path": "goods_details/index", "style": { - "navigationBarTitleText": "商品详情" + "navigationBarTitleText": "商品详情" } - } - ,{ + }, { "path": "system_form/index", "style": { - "navigationBarTitleText": "系统表单" + "navigationBarTitleText": "系统表单" } } // #endif - ,{ + , { "path": "storeDiy/index", "style": { "navigationStyle": "custom", @@ -705,7 +752,7 @@ } } // #ifdef H5 - ,{ + , { "path": "scan/index", "style": { "navigationBarTitleText": "手机扫码上传" @@ -748,13 +795,13 @@ } }, { - "path":"storeClassification/index", + "path": "storeClassification/index", "style": { "navigationBarTitleText": "店铺分类" } }, { - "path":"storeClassification/addStoreClass", + "path": "storeClassification/addStoreClass", "style": { "navigationBarTitleText": "添加店铺分类" } @@ -772,7 +819,7 @@ } }, { - "path":"addGoods/addGoodDetils", + "path": "addGoods/addGoodDetils", "style": { "navigationBarTitleText": "商品详情" } @@ -820,8 +867,7 @@ { "root": "pages/plantGrass", "name": "plant_grass", - "pages": [ - { + "pages": [{ "path": "plant_detail/index", "style": { "navigationBarTitleText": "内容详情" @@ -830,7 +876,7 @@ { "path": "plant_release/index", "style": { - "navigationBarTitleText": "内容发布" + "navigationBarTitleText": "内容发布" } }, { @@ -916,8 +962,7 @@ "navigationBarTitleText": "搜索商品" } } - ] - , + ], "plugins": { "live-player-plugin": { "version": "1.3.2", @@ -1094,188 +1139,188 @@ ] }, { - "root": "pages/short_video", - "name": "shortVideo", - "pages": [{ - "navigationBarTitleText": "短视频", - "enablePullDownRefresh": false, - //#ifdef APP - "path": "appSwiper/index", - //#endif - //#ifndef APP - "path": "nvueSwiper/index", - //#endif - "style": { + "root": "pages/short_video", + "name": "shortVideo", + "pages": [{ + "navigationBarTitleText": "短视频", + "enablePullDownRefresh": false, + //#ifdef APP + "path": "appSwiper/index", + //#endif + //#ifndef APP + "path": "nvueSwiper/index", + //#endif + "style": { "navigationBarTitleText": "社区短视频", - "app-plus": { - "titleNView": false, - "bounce": "none" - } - } - }] + "app-plus": { + "titleNView": false, + "bounce": "none" + } + } + }] }, { - "root": "pages/points_mall", - "pages": [{ - "path": "index", - "style": { - "navigationBarTextStyle": "white", - "navigationBarBackgroundColor": "#333333", - "navigationBarTitleText": "积分商城", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - }, - { - "path": "integral_goods_list", - "style": { - "navigationBarTitleText": "商品列表", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - }, - { - "path": "goods_selection", - "style": { - "navigationBarTitleText": "好物精选", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } + "root": "pages/points_mall", + "pages": [{ + "path": "index", + "style": { + "navigationBarTextStyle": "white", + "navigationBarBackgroundColor": "#333333", + "navigationBarTitleText": "积分商城", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } }, { - "path": "integral_goods_details", - "style": { - "navigationBarTitleText": "商品详情", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - // #ifdef MP - , - "disableScroll": true - // #endif - } - }, - { - "path": "integral_order", - "style": { - "navigationBarTitleText": "积分订单", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - }, - { - "path": "exchange_record", - "style": { - "navigationBarTitleText": "兑换记录", + "path": "integral_goods_list", + "style": { + "navigationBarTitleText": "商品列表", "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif } - } - },{ - "path": "integral_order_details", - "style": { - "navigationBarTitleText": "兑换订单详情" - } - } - ] + } + }, + { + "path": "goods_selection", + "style": { + "navigationBarTitleText": "好物精选", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, + { + "path": "integral_goods_details", + "style": { + "navigationBarTitleText": "商品详情", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + // #ifdef MP + , + "disableScroll": true + // #endif + } + }, + { + "path": "integral_order", + "style": { + "navigationBarTitleText": "积分订单", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, + { + "path": "exchange_record", + "style": { + "navigationBarTitleText": "兑换记录", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, { + "path": "integral_order_details", + "style": { + "navigationBarTitleText": "兑换订单详情" + } + } + ] }, { - "root": "pages/annex", + "root": "pages/annex", "name": "annx", - "pages": [{ - "path": "web_view/index", - "style": { - "navigationBarTitleText": "", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - }, { - "path": "vip_paid/index", - "style": { - "navigationBarTitleText": "开通会员", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - }, { - "path": "vip_center/index", - "style": { - "navigationBarTitleText": "会员中心", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - }, + "pages": [{ + "path": "web_view/index", + "style": { + "navigationBarTitleText": "", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, { + "path": "vip_paid/index", + "style": { + "navigationBarTitleText": "开通会员", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, { + "path": "vip_center/index", + "style": { + "navigationBarTitleText": "会员中心", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + }, { - "path": "vip_grade/index", - "style": { - "navigationBarTitleText": "会员卡", + "path": "vip_grade/index", + "style": { + "navigationBarTitleText": "会员卡", "navigationBarTextStyle": "white", "navigationBarBackgroundColor": "#302F35", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } }, - { - "path": "vip_clause/index", - "style": { - "navigationBarTitleText": "会员协议", - "app-plus": { - // #ifdef APP-PLUS - "titleNView": { - "type": "default" - } - // #endif - } - } - } - ] + { + "path": "vip_clause/index", + "style": { + "navigationBarTitleText": "会员协议", + "app-plus": { + // #ifdef APP-PLUS + "titleNView": { + "type": "default" + } + // #endif + } + } + } + ] } ], "globalStyle": { @@ -1297,10 +1342,8 @@ "selectedColor": "#E93323", "borderStyle": "white", "backgroundColor": "#ffffff", - "list": [ - { - "pagePath": "pages/index/index" - , + "list": [{ + "pagePath": "pages/index/index", "iconPath": "static/images/1-001.png", "selectedIconPath": "static/images/1-002.png", "text": "首页" @@ -1327,7 +1370,7 @@ { "pagePath": "pages/order_addcart/order_addcart", "iconPath": "static/images/3-001.png", - "selectedIconPath": "static/images/3-002.png", + "selectedIconPath": "static/images/3-002.png", "text": "购物车" }, { diff --git a/pages/cloud_warehouse/big_classification/index.vue b/pages/cloud_warehouse/big_classification/index.vue new file mode 100644 index 0000000..9870eb9 --- /dev/null +++ b/pages/cloud_warehouse/big_classification/index.vue @@ -0,0 +1,87 @@ + + + + + + \ No newline at end of file diff --git a/pages/cloud_warehouse/select_address/index.vue b/pages/cloud_warehouse/select_address/index.vue new file mode 100644 index 0000000..3661432 --- /dev/null +++ b/pages/cloud_warehouse/select_address/index.vue @@ -0,0 +1,406 @@ + + + + + \ No newline at end of file diff --git a/pages/cloud_warehouse/small_classification/index.vue b/pages/cloud_warehouse/small_classification/index.vue new file mode 100644 index 0000000..d492f1e --- /dev/null +++ b/pages/cloud_warehouse/small_classification/index.vue @@ -0,0 +1,553 @@ + + + + + \ No newline at end of file diff --git a/pages/helpPeople/formTable.vue b/pages/helpPeople/formTable.vue new file mode 100644 index 0000000..bc1f985 --- /dev/null +++ b/pages/helpPeople/formTable.vue @@ -0,0 +1,1130 @@ + + + + \ No newline at end of file diff --git a/pages/helpPeople/helpPeople.vue b/pages/helpPeople/helpPeople.vue new file mode 100644 index 0000000..0ad788a --- /dev/null +++ b/pages/helpPeople/helpPeople.vue @@ -0,0 +1,90 @@ + + + + + \ No newline at end of file diff --git a/pages/points_mall/integral_order.vue b/pages/points_mall/integral_order.vue index 7de48f1..0fb32ba 100644 --- a/pages/points_mall/integral_order.vue +++ b/pages/points_mall/integral_order.vue @@ -12,7 +12,8 @@ v-if="addressInfo.is_default">[默认]{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.street || ''}}{{addressInfo.detail}} - + 设置收货地址 @@ -35,14 +36,15 @@ {{goods.product.store_name}} x{{goods.cart_num}} - + {{goods.productAttr.sku}} - {{goods.productAttr.ot_price}}积分+{{goods.productAttr.price}}元 + {{goods.productAttr.ot_price}}积分 + +{{goods.productAttr.price}}元 - + @@ -78,8 +80,8 @@ 备注信息 - @@ -125,12 +127,13 @@ 支付: - {{resData.order_total_integral || 0}}积分+{{resData.order_pay_price}}元 + {{resData.order_total_integral || 0}}积分+{{resData.order_pay_price}}元 立即兑换 - + @@ -162,18 +165,26 @@ CACHE_LONGITUDE, CACHE_LATITUDE } from '@/config/cache.js'; - import { openPaySubscribe } from '@/utils/SubscribeMessage.js'; + import { + openPaySubscribe + } from '@/utils/SubscribeMessage.js'; import addressWindow from '@/components/addressWindow'; - import { HTTP_REQUEST_URL } from '@/config/app'; - import { toLogin } from '@/libs/login.js'; - import { mapGetters } from "vuex"; + import { + HTTP_REQUEST_URL + } from '@/config/app'; + import { + toLogin + } from '@/libs/login.js'; + import { + mapGetters + } from "vuex"; export default { components: { addressWindow, }, data() { return { - confirm:[], + confirm: [], textareaStatus: true, //支付方式 cartArr: [{ @@ -264,12 +275,12 @@ urlQuery: '', pay_close: false, resData: {}, - product_type:1, + product_type: 1, newImg: [], domain: HTTP_REQUEST_URL, }; }, - computed: mapGetters(['isLogin','viewColor','keyColor']), + computed: mapGetters(['isLogin', 'viewColor', 'keyColor']), onLoad: function(options) { // #ifdef H5 this.from = this.$wechat.isWeixin() ? 'weixin' : 'h5' @@ -317,7 +328,7 @@ }) }, methods: { - getFun(){ + getFun() { this.getaddressInfo(); this.$nextTick(function() { this.getUserInfo(); @@ -355,7 +366,7 @@ return that.$util.Tips({ title: '积分不足!' }); - + data = { cart_id: this.cartId.split(","), address_id: this.addressId, @@ -398,7 +409,8 @@ orderId = res.data.result.order_id, callback_key = res.data.result.pay_key, jsConfig = res.data.result.config, - goPages = '/pages/order_pay_status/index?order_type=20&order_id=' + orderId + '&msg=' + res.message; + goPages = '/pages/order_pay_status/index?order_type=20&order_id=' + orderId + '&msg=' + + res.message; that.orderPay = true; uni.hideLoading(); switch (status) { @@ -453,17 +465,19 @@ }) // #endif // #ifdef APP-PLUS - let mp_pay_name='' - if(uni.requestOrderPayment){ - mp_pay_name='requestOrderPayment' - }else{ - mp_pay_name='requestPayment' + let mp_pay_name = '' + if (uni.requestOrderPayment) { + mp_pay_name = 'requestOrderPayment' + } else { + mp_pay_name = 'requestPayment' } uni[mp_pay_name]({ provider: 'wxpay', orderInfo: jsConfig, success: (e) => { - let url = '/pages/order_pay_status/index?order_type=20&order_id=' + orderId + + let url = + '/pages/order_pay_status/index?order_type=20&order_id=' + + orderId + '&msg=支付成功'; return that.$util.Tips({ title: '支付成功', @@ -474,7 +488,9 @@ }); }, fail: (e) => { - let url = '/pages/order_pay_status/index?order_type=20&order_id=' + orderId + '&msg=取消支付'; + let url = + '/pages/order_pay_status/index?order_type=20&order_id=' + + orderId + '&msg=取消支付'; return that.$util.Tips({ title: '取消支付', }, { @@ -483,7 +499,9 @@ }); }, complete: () => { - let url = '/pages/order_pay_status/index?order_type=20&order_id=' + orderId + '&msg=取消支付'; + let url = + '/pages/order_pay_status/index?order_type=20&order_id=' + + orderId + '&msg=取消支付'; return that.$util.Tips({ title: '取消支付', }, { @@ -499,11 +517,11 @@ case "routine": jsConfig.timeStamp = jsConfig.timestamp; that.toPay = true; - let mp_pay_name='' - if(uni.requestOrderPayment){ - mp_pay_name='requestOrderPayment' - }else{ - mp_pay_name='requestPayment' + let mp_pay_name = '' + if (uni.requestOrderPayment) { + mp_pay_name = 'requestOrderPayment' + } else { + mp_pay_name = 'requestPayment' } uni[mp_pay_name]({ ...jsConfig, @@ -518,7 +536,8 @@ }); }, fail: function(e) { - let pages = '/pages/order_pay_status/index?order_type=20&order_id=' + + let pages = + '/pages/order_pay_status/index?order_type=20&order_id=' + orderId + '&msg=取消支付' return that.$util.Tips({ title: '取消支付' @@ -542,7 +561,8 @@ // #ifdef H5 case 'h5': let host = window.location.protocol + "//" + window.location.host; - let url = `${host}/pages/order_pay_status/index?order_type=20&order_id=${orderId}&msg=${res.message}` + let url = + `${host}/pages/order_pay_status/index?order_type=20&order_id=${orderId}&msg=${res.message}` let eUrl = encodeURIComponent(url) let jsurl = jsConfig.mweb_url || jsConfig.h5_url let locations = `${jsurl}&redirect_url=${eUrl}` @@ -566,7 +586,8 @@ }); }, fail: (e) => { - let pages = '/pages/order_pay_status/index?order_type=20&order_id=' + + let pages = + '/pages/order_pay_status/index?order_type=20&order_id=' + orderId + '&msg=支付失败' return that.$util.Tips({ title: '支付失败' @@ -577,7 +598,8 @@ }, complete: () => { uni.hideLoading(); - let pages = '/pages/order_pay_status/index?order_type=20&order_id=' + + let pages = + '/pages/order_pay_status/index?order_type=20&order_id=' + orderId + '&msg=取消支付' return that.$util.Tips({ title: '取消支付' @@ -589,7 +611,7 @@ }); break; // #endif - default: + default: let pages = '/pages/order_pay_status/index?order_type=20&order_id=' + orderId + '&msg=取消支付' return that.$util.Tips({ @@ -647,10 +669,10 @@ }, ChangCouponsClose: function() { - + }, changeTextareaStatus: function() { - + }, /** * 选择地址后改变事件 @@ -694,7 +716,7 @@ }, bindTimeChange: function(e, index) { this.confirm[index].value = e.target.value - }, + }, /* * 获取默认收货地址或者获取某条地址信息 */ @@ -719,11 +741,11 @@ }, onAddress: function() { let that = this; - if(that.addressInfo.real_name){ + if (that.addressInfo.real_name) { that.textareaStatus = false; that.address.address = true; - that.pagesUrl = '/pages/users/user_address/index?cartId=' + this.cartId+'&product_type=20'; - }else{ + that.pagesUrl = '/pages/users/user_address/index?cartId=' + this.cartId + '&product_type=20'; + } else { uni.navigateTo({ url: `/pages/users/user_address/index?cartId=${this.cartId}&product_type=20`, }); @@ -742,63 +764,78 @@ /deep/uni-checkbox[disabled] .uni-checkbox-input { background-color: #eee; } + .alipaysubmit { display: none; } + .order-submission .line image { width: 100%; height: 100%; display: block; } + .order-submission .address { padding: 28rpx 30rpx; background-color: #fff; box-sizing: border-box; } + .order-submission .address .addressCon { width: 610rpx; font-size: 26rpx; color: #666; } + .order-submission .address .addressCon .name { font-size: 30rpx; color: #282828; font-weight: bold; margin-bottom: 10rpx; } + .order-submission .address .addressCon .name .phone { margin-left: 50rpx; } + .order-submission .address .addressCon .default { margin-right: 12rpx; } + .order-submission .address .addressCon .setaddress { color: #333; font-size: 28rpx; } + .order-submission .address .iconfont { font-size: 35rpx; color: #707070; } + .order-submission .allAddress { width: 100%; } + .order-submission .allAddress .nav { width: 710rpx; margin: 0 auto; } + .order-submission .allAddress .nav .item { width: 355rpx; position: relative; } + .order-submission .allAddress .nav .item.on { position: relative; width: 250rpx; } + .order-submission .allAddress .address { height: 150rpx; margin: 0 auto; } + .order-submission .allAddress .line { margin: 0 auto; position: absolute; @@ -807,6 +844,7 @@ width: 100%; height: 3rpx; } + .order-submission .wrapper .item .list .payItem { border: 1px solid #eee; border-radius: 6rpx; @@ -817,10 +855,12 @@ font-size: 28rpx; color: #282828; } + .order-submission .wrapper .item .list .payItem.on { border-color: var(--view-theme); color: var(--view-theme); } + .order-submission .wrapper .item .list .payItem .name { width: 50%; text-align: center; @@ -828,6 +868,7 @@ justify-content: left; padding-left: 80rpx; } + .order-submission .wrapper .item .list .payItem .name .iconfont { width: 44rpx; height: 44rpx; @@ -839,35 +880,43 @@ font-size: 30rpx; margin-right: 15rpx; } + .order-submission .wrapper .item .list .payItem .name .iconfont.icon-weixin2 { background-color: #41b035; } + .order-submission .wrapper .item .list .payItem .name .iconfont.icon-icon34 { background-color: #4295D5; } + .order-submission .wrapper .item .list .payItem .tip { width: 49%; text-align: center; font-size: 26rpx; color: #aaa; } + .storeinfo-wrapper { .store-item { margin-top: 12rpx; background-color: #fff; + .product-item { display: flex; padding: 25rpx 30rpx; border-top: 1px solid #F0F0F0; + .img-box { width: 130rpx; height: 130rpx; + image { width: 130rpx; height: 130rpx; border-radius: 16rpx; } } + .content { position: relative; width: 550rpx; @@ -875,32 +924,38 @@ font-size: 28rpx; color: #282828; overflow: hidden; - .number{ + + .number { display: block; text-align: right; color: #999; font-size: 26rpx; } + .label { margin-top: 10rpx; color: #999999; font-size: 20rpx; } + .price { margin-top: 20rpx; color: var(--view-priceColor); position: relative; + text { margin-left: 10rpx; color: #999; } - + } + .err-txt { display: flex; align-items: center; margin-top: 18rpx; color: $theme-color; + .iconfont { margin-right: 10rpx; } @@ -909,31 +964,38 @@ } } } + .order-submission .wrapper { background-color: #fff; margin-top: 13rpx; } - .order-submission .wrapper .item .name{ + + .order-submission .wrapper .item .name { position: relative; } - .order-submission .wrapper .item .asterisk{ + + .order-submission .wrapper .item .asterisk { position: absolute; - color:red; - left:-15rpx + color: red; + left: -15rpx } + .order-submission .wrapper .item { padding: 27rpx 30rpx; font-size: 30rpx; color: #282828; border-bottom: 1px solid #f0f0f0; } + .order-submission .wrapper .item .discount { font-size: 30rpx; color: #999; } + .order-submission .wrapper .item .discount input { text-align: end; } + .order-submission .wrapper .item .discount .iconfont { color: #515151; font-size: 30rpx; @@ -951,6 +1013,7 @@ position: relative; padding-right: 58rpx; } + .order-submission .wrapper .item .shipping .iconfont { font-size: 35rpx; color: #707070; @@ -960,6 +1023,7 @@ transform: translateY(-50%); margin-left: 30rpx; } + .order-submission .wrapper .item textarea { background-color: #f9f9f9; width: 690rpx; @@ -969,27 +1033,34 @@ padding: 25rpx 28rpx; box-sizing: border-box; } + .order-submission .wrapper .item .placeholder { color: #ccc; } + .order-submission .wrapper .item .list { margin-top: 35rpx; } + .order-submission .moneyList { margin-top: 12rpx; background-color: #fff; padding: 30rpx; } + .order-submission .moneyList .item { font-size: 28rpx; color: #282828; } + .order-submission .moneyList .item~.item { margin-top: 20rpx; } + .order-submission .moneyList .item .money { color: #868686; } + .order-submission .footer { width: 100%; height: 100rpx; @@ -1002,9 +1073,11 @@ bottom: 0; left: 0; } - .order-submission .footer .color-t{ + + .order-submission .footer .color-t { color: var(--view-theme); } + .order-submission .footer .settlement { font-size: 30rpx; color: #fff; @@ -1015,11 +1088,13 @@ text-align: center; line-height: 70rpx; } + .footer .transparent { opacity: 0 } + .pictrue image { width: 130rpx; height: 130rpx; } - + \ No newline at end of file diff --git a/pages/user/index.vue b/pages/user/index.vue index 84f2910..56c6cbb 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -2,7 +2,7 @@ - + @@ -14,14 +14,16 @@ - + @@ -162,11 +198,13 @@ 进入平台客服中心 - + - + 商家管理 @@ -181,18 +219,33 @@ 进入平台客服中心 - + + + {{copyright.Copyright}} + 备案号:蜀ICP备2022030133号-2A + 增值电信营业许可证号:川B2-20221250 + + + + + 众邦科技提供技术支持 + + + @@ -213,20 +266,37 @@ // | Author: CRMEB Team // +---------------------------------------------------------------------- let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px'; - import { getMenuList, getUserInfo, setVisit } from '@/api/user.js'; - import { getVersion, getNavigation } from "@/api/public"; - import { orderData } from '@/api/order.js' - import { mapGetters } from "vuex"; + import { + getMenuList, + getUserInfo, + setVisit + } from '@/api/user.js'; + import { + getVersion, + getNavigation + } from "@/api/public"; + import { + orderData + } from '@/api/order.js' + import { + mapGetters + } from "vuex"; import dayjs from '@/plugin/dayjs/dayjs.min.js'; import Cache from '@/utils/cache'; // #ifndef H5 import passwordPopup from '@/components/passwordPopup'; // #endif import customTab from '@/components/customTab'; - import { configMap } from '@/utils'; + import { + configMap + } from '@/utils'; import Auth from '../../libs/wechat'; - import { HTTP_REQUEST_URL } from '@/config/app'; - import { toLogin } from '@/libs/login.js'; + import { + HTTP_REQUEST_URL + } from '@/config/app'; + import { + toLogin + } from '@/libs/login.js'; const app = getApp(); export default { components: { @@ -244,7 +314,7 @@ balance_func_status: 0, svip_switch_status: 0, navigation: {} - }, mapGetters(['isLogin','viewColor','keyColor'])), + }, mapGetters(['isLogin', 'viewColor', 'keyColor'])), filters: { dateFormat: function(value) { return dayjs(value * 1000).format('YYYY-MM-DD'); @@ -259,59 +329,112 @@ showSkeleton: true, //骨架屏显示隐藏 isNodes: 0, //控制什么时候开始抓取元素节点,只要数值改变就重新抓取 orderMenu: [{ - icon: 'icon-daifukuan1', - title: '待付款', - url: '/pages/users/order_list/index?status=0', - num: 0 - }, - { - icon: 'icon-daifahuo1', - title: '待发货', - url: '/pages/users/order_list/index?status=1', - num: 0 - }, - { - icon: 'icon-daishouhuo1', - title: '待收货', - url: '/pages/users/order_list/index?status=2', - num: 0 - }, - { - icon: 'icon-daipingjia1', - title: '待评价', - url: '/pages/users/order_list/index?status=3', - num: 0 - }, - { - icon: 'icon-a-shouhoutuikuan1', - title: '售后/退款', - url: '/pages/users/refund/list', - num: 0 - }, + icon: 'icon-daifukuan1', + title: '待付款', + url: '/pages/users/order_list/index?status=0', + num: 0 + }, + { + icon: 'icon-daifahuo1', + title: '待发货', + url: '/pages/users/order_list/index?status=1', + num: 0 + }, + { + icon: 'icon-daishouhuo1', + title: '待收货', + url: '/pages/users/order_list/index?status=2', + num: 0 + }, + { + icon: 'icon-daipingjia1', + title: '待评价', + url: '/pages/users/order_list/index?status=3', + num: 0 + }, + { + icon: 'icon-a-shouhoutuikuan1', + title: '售后/退款', + url: '/pages/users/refund/list', + num: 0 + }, ], - imgUrls: [{url:'',pic:''}], + imgUrls: [{ + url: '', + pic: '' + }], userMenu: [], skeletonMenu: [], - personalMenu: [ - {pic: '',name: '',isShow: true}, - {pic: '',name: '',isShow: true}, - {pic: '',name: '',isShow: true}, - {pic: '',name: '',isShow: true}, - {pic: '',name: '',isShow: true}, - {pic: '',name: '',isShow: true}, - {pic: '',name: '',isShow: true}, - {pic: '',name: '',isShow: true}, - {pic: '',name: '',isShow: true}, - {pic: '',name: '',isShow: true}, - {pic: '',name: '',isShow: true}, - {pic: '',name: '',isShow: true} + personalMenu: [{ + pic: '', + name: '', + isShow: true + }, + { + pic: '', + name: '', + isShow: true + }, + { + pic: '', + name: '', + isShow: true + }, + { + pic: '', + name: '', + isShow: true + }, + { + pic: '', + name: '', + isShow: true + }, + { + pic: '', + name: '', + isShow: true + }, + { + pic: '', + name: '', + isShow: true + }, + { + pic: '', + name: '', + isShow: true + }, + { + pic: '', + name: '', + isShow: true + }, + { + pic: '', + name: '', + isShow: true + }, + { + pic: '', + name: '', + isShow: true + }, + { + pic: '', + name: '', + isShow: true + } ], autoplay: true, circular: true, interval: 3000, duration: 500, orderStatusNum: {}, - userInfo: {aratar: '/static/f.png',is_svip:0}, + userInfo: { + aratar: '/static/f.png', + is_svip: 0 + }, MyMenus: [], is_promoter: 0, //推广人开关 1开 extension_status: 0, @@ -324,7 +447,7 @@ } }, onLoad() { - + }, onReady() { this.isNodes++; @@ -345,7 +468,7 @@ // this.userInfo = { // is_svip: 0 // } - this.orderMenu.forEach(v=>{ + this.orderMenu.forEach(v => { v.num = 0 }) this.getMyMenus(); @@ -355,30 +478,37 @@ }, 500) }, methods: { - authTo(url){ - if(this.isLogin){ + authTo(url) { + if (this.isLogin) { uni.navigateTo({ url: url }) - }else{ + } else { this.openAuto() } }, - goSvip(){ - if(this.isLogin){ - if(this.userInfo.is_svip > 0){ + + tempClick() { + uni.navigateTo({ + url: "/pages/helpPeople/helpPeople" + }) + }, + + goSvip() { + if (this.isLogin) { + if (this.userInfo.is_svip > 0) { uni.navigateTo({ url: '/pages/annex/vip_center/index' }) - }else{ + } else { uni.navigateTo({ url: '/pages/annex/vip_paid/index' }) } - }else{ + } else { this.openAuto() } - + }, goRouter(item) { var pages = getCurrentPages(); @@ -403,7 +533,7 @@ } }) }, - toService(is_sys){ + toService(is_sys) { uni.navigateTo({ url: '/pages/admin/business/index?is_sys=' + is_sys }) @@ -412,44 +542,46 @@ getVersion().then(data => { this.copyright = data.data; }); - }, + }, // 菜单显示 - filterMenus: function(item){ + filterMenus: function(item) { let that = this; - if(item.url=='/pages/users/user_money/index') item.isShow = that.balance_func_status == 1 - else if(item.url=='/pages/users/user_spread_user/index'){ - if(that.extension_status == 0){ + if (item.url == '/pages/users/user_money/index') item.isShow = that.balance_func_status == 1 + else if (item.url == '/pages/users/user_spread_user/index') { + if (that.extension_status == 0) { item.isShow = false - } else if(that.extension_status == 1){ - if(that.is_promoter == 1){ + } else if (that.extension_status == 1) { + if (that.is_promoter == 1) { item.isShow = that.is_promoter == 1 && that.extension_status == 1 - }else if(that.is_promoter == 0 ){ + } else if (that.is_promoter == 0) { item.isShow = that.is_promoter == 0 && that.extension_status == 1 - item.url="/pages/users/distributor/index" + item.url = "/pages/users/distributor/index" } } - } - else if(item.url=='/pages/store/settled/index')item.isShow = that.mer_intention_open == 1 - else if(item.url=='/pages/users/user_grade/index') item.isShow = that.member_status == 1 - else if(item.url=='/pages/users/user_integral/index') item.isShow = that.integral_status == 1 + } else if (item.url == '/pages/store/settled/index') item.isShow = that.mer_intention_open == 1 + else if (item.url == '/pages/users/user_grade/index') item.isShow = that.member_status == 1 + else if (item.url == '/pages/users/user_integral/index') item.isShow = that.integral_status == 1 else item.isShow = true }, - showMenu(menu){ - return !menu || ['integral','service','admin_order','verify_order','intention','promoter','balance'].indexOf(menu) === -1; + showMenu(menu) { + return !menu || ['integral', 'service', 'admin_order', 'verify_order', 'intention', 'promoter', 'balance'] + .indexOf(menu) === -1; }, - goUrl(url){ - if(url.indexOf("http") != -1){ + goUrl(url) { + if (url.indexOf("http") != -1) { // #ifdef H5 location.href = url // #endif - }else{ - if(['/pages/goods_cate/goods_cate','/pages/order_addcart/order_addcart','/pages/user/index','/pages/plant_grass/index'].indexOf(url) == -1){ + } else { + if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index', + '/pages/plant_grass/index' + ].indexOf(url) == -1) { uni.navigateTo({ - url:url + url: url }) - }else{ + } else { uni.switchTab({ - url:url + url: url }) } } @@ -529,7 +661,7 @@ if (this.MyMenus.length) return; getMenuList().then(res => { that.personalMenu = [] - res.data.menu.forEach((item,index)=>{ + res.data.menu.forEach((item, index) => { that.filterMenus(item) that.personalMenu.push(item) }) @@ -539,20 +671,20 @@ }, // 编辑页面 goEdit() { - if(this.isLogin){ + if (this.isLogin) { uni.navigateTo({ url: '/pages/users/user_info/index' }) - }else{ + } else { this.openAuto() } }, goSetting() { - if(this.isLogin){ + if (this.isLogin) { uni.navigateTo({ url: '/pages/users/user_setting/index' }) - }else{ + } else { this.openAuto() } }, @@ -572,14 +704,14 @@ } }, }, - onPullDownRefresh: function(){ + onPullDownRefresh: function() { this.getNav(); if (this.isLogin) { this.getUserInfo(); this.orderNum(); } else { this.userInfo = {} - this.orderMenu.forEach(v=>{ + this.orderMenu.forEach(v => { v.num = 0 }) this.getMyMenus(); @@ -600,7 +732,8 @@ padding: 0 30rpx 0 105rpx; border-radius: 16rpx 16rpx 0 0; box-sizing: border-box; - .svip_user{ + + .svip_user { width: 52rpx; height: 52rpx; border-radius: 100%; @@ -608,16 +741,19 @@ left: 30rpx; top: 17rpx; } + .left-box { font-size: 26rpx; color: #905100; font-weight: 400; } + .btn { color: #905100; font-weight: 400; font-size: 24rpx; } + .btn-open { background: #282828; border-radius: 40rpx; @@ -630,17 +766,21 @@ justify-content: center; } } + .new-users { .head { background: #fff; + .user-card { position: relative; width: 100%; - padding: 35rpx 0 50rpx; + padding: 35rpx 0 0rpx; background-image: linear-gradient(90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%); - &.svip-card{ + + &.svip-card { padding: 35rpx 0 120rpx; } + .bg { position: absolute; left: 0; @@ -649,27 +789,33 @@ height: 100%; background-size: 100% 100%; } + .user-info { z-index: 20; position: relative; display: flex; padding: 0 28rpx; - .level_icon{ + + .level_icon { width: 34rpx; height: 32rpx; margin: 4rpx 0 0 6rpx; border: none; } - .avatar-box{ + + .avatar-box { width: 120rpx; height: 120rpx; border-radius: 50%; position: relative; - .avatar,image{ + + .avatar, + image { width: 120rpx; height: 120rpx; border-radius: 50%; } + &.on { .avatar { border: 2px solid #FFAC65; @@ -678,6 +824,7 @@ } } } + .headwear { position: absolute; right: -4rpx; @@ -685,11 +832,13 @@ width: 44rpx; height: 44rpx; z-index: -1; + image { width: 100%; height: 100%; } } + .info { flex: 1; display: flex; @@ -697,26 +846,31 @@ justify-content: space-between; margin-left: 20rpx; padding: 15rpx 0; + .name { display: flex; align-items: center; color: #fff; font-size: 31rpx; + .vip { width: 82rpx; height: 36rpx; margin-left: 12rpx; + image { width: 82rpx; height: 36rpx; } } } + .num { display: flex; align-items: center; font-size: 26rpx; color: rgba(255, 255, 255, 0.6); + image { width: 22rpx; height: 23rpx; @@ -725,6 +879,7 @@ } } } + .num-wrapper { z-index: 30; position: relative; @@ -733,13 +888,16 @@ justify-content: space-between; margin: 30rpx 20rpx 0; color: #fff; + .num-item { width: 25%; text-align: center; + .num { font-size: 42rpx; font-weight: bold; } + .txt { margin-top: 8rpx; font-size: 22rpx; @@ -747,6 +905,7 @@ } } } + .sign { z-index: 200; position: absolute; @@ -763,16 +922,65 @@ font-size: 28rpx; font-weight: bold; } + + .packet_card { + height: 140rpx; + width: 710rpx; + background-color: rgba(#fff, 0.3); + margin: 0 auto; + border-radius: 20rpx 20rpx 0 0; + margin-top: 20rpx; + position: relative; + color: #fff; + display: flex; + justify-content: space-between; + + .p_d_item { + position: absolute; + font-size: 26rpx; + font-weight: bold; + width: 300rpx; + height: 100rpx; + display: flex; + justify-content: center; + flex-direction: column; + align-items: center; + + &:nth-child(1) { + top: 20rpx; + left: 30rpx; + } + + &:nth-child(2) { + top: 20rpx; + right: 30rpx; + } + + .p_d_count { + display: flex; + align-items: center; + font-size: 38rpx; + + image { + width: 53rpx; + height: 53rpx; + } + } + } + } } } + .wrapper { position: relative; padding: 0 20rpx; margin-top: 20rpx; } + .order-wrapper { background-color: #fff; border-radius: 16rpx; + .order-hd { height: 80rpx; align-items: center; @@ -780,13 +988,16 @@ border-bottom: 1px dashed #DDDDDD; padding: 0 30rpx; color: #282828; + .left { font-weight: bold; } + .right { align-items: center; color: #666666; font-size: 26rpx; + .icon-xiangyou { margin-left: 5rpx; margin-top: 6rpx; @@ -794,8 +1005,10 @@ } } } + .order-bd { display: flex; + .order-item { display: flex; flex-direction: column; @@ -803,14 +1016,17 @@ align-items: center; width: 20%; height: 160rpx; + .pic { position: relative; text-align: center; - .iconfont{ + + .iconfont { font-size: 62rpx; color: var(--view-theme); } } + .txt { margin-top: 8rpx; font-size: 26rpx; @@ -819,22 +1035,27 @@ } } } + .slider-wrapper { margin: 20rpx 0; height: 130rpx; + swiper, swiper-item { height: 100%; } + image { width: 100%; height: 130rpx; } } + .user-menus { padding-bottom: 30rpx; background-color: #fff; border-radius: 16rpx; + .title { height: 80rpx; line-height: 80rpx; @@ -842,6 +1063,7 @@ border-bottom: 1px dashed #DDDDDD; font-weight: bold; } + .item { position: relative; display: flex; @@ -853,20 +1075,24 @@ height: 90rpx; margin-top: 40rpx; text-align: center; + .item-count { display: flex; flex-direction: column; align-items: center; width: 100%; } + image { width: 52rpx; height: 52rpx; } - .skeleton_image{ + + .skeleton_image { width: 80rpx; height: 80rpx; } + text { margin-top: 10rpx; font-size: 26rpx; @@ -876,17 +1102,21 @@ white-space: nowrap; width: 78%; } + &:last-child::before { display: none; } } + button { font-size: 28rpx; } } + .phone { color: #fff; } + .order-status-num { background-color: #fff; color: var(--view-theme); @@ -905,32 +1135,35 @@ border: 1px solid var(--view-theme); } } + .sys-head { - position: relative; - width: 100%; - // background: linear-gradient(90deg, $bg-star1 0%, $bg-end1 100%); - - .bg { - position: absolute; - left: 0; - top: 0; - width: 100%; - height: 100%; - background-image:linear-gradient(90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%); - background-size: 100% auto; - background-position: left bottom; - } - .sys-title { - z-index: 10; - position: relative; - height: 43px; - text-align: center; - line-height: 43px; - font-size: 32rpx; - color: #FFFFFF; - } + position: relative; + width: 100%; + // background: linear-gradient(90deg, $bg-star1 0%, $bg-end1 100%); + + .bg { + position: absolute; + left: 0; + top: 0; + width: 100%; + height: 100%; + background-image: linear-gradient(90deg, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%); + background-size: 100% auto; + background-position: left bottom; + } + + .sys-title { + z-index: 10; + position: relative; + height: 43px; + text-align: center; + line-height: 43px; + font-size: 32rpx; + color: #FFFFFF; + } } - .menus-list-item{ + + .menus-list-item { background: #fff; border-radius: 12rpx; padding: 30rpx 50rpx 30rpx 40rpx; @@ -938,29 +1171,35 @@ align-items: center; justify-content: space-between; margin-top: 20rpx; - .title{ + + .title { font-size: 34rpx; color: #282828; font-weight: bold; - .merchant{ + + .merchant { color: #E93323; } - .plantform{ + + .plantform { color: #FFC552; } } - .info{ + + .info { margin-top: 15rpx; color: #666666; font-size: 22rpx; } - .image{ + + .image { width: 180rpx; height: 108rpx; background-size: 100%; background-repeat: no-repeat; } } + .copy-right { display: flex; flex-direction: column; @@ -972,18 +1211,22 @@ margin-bottom: 98rpx; margin-bottom: calc(98rpx+ constant(safe-area-inset-bottom)); ///兼容 IOS<11.2/ margin-bottom: calc(98rpx + env(safe-area-inset-bottom)); ///兼容 IOS>11.2/ + .iconfont { font-size: 60rpx; } - .img-copyright{ + + .img-copyright { width: 120rpx; height: 60rpx; } } + .menu-box { display: flex; flex-wrap: wrap; } + .right-btn { z-index: 99; position: absolute; @@ -992,13 +1235,16 @@ display: flex; align-items: center; color: #fff; + .iconfont { font-size: 40rpx; margin-left: 33rpx; } + .btn { position: relative; } + .iconnum { min-width: 6px; background-color: #fff; @@ -1011,21 +1257,24 @@ padding: 0 4px; } } - .menu-list-count{ + + .menu-list-count { background-color: #fff; margin-top: 20rpx; border-radius: 12rpx; display: flex; align-items: center; justify-content: space-between; - .menu-item{ + + .menu-item { width: 50%; padding: 25rpx 15rpx; display: flex; align-items: center; position: relative; - &:first-child{ - &::after{ + + &:first-child { + &::after { content: ""; display: block; border-right: 1rpx solid #E2E2E2; @@ -1034,32 +1283,40 @@ right: 0; } } + .image { width: 106rpx; height: 64rpx; background-size: 100%; background-repeat: no-repeat; - &.merchant-image{ + + &.merchant-image { margin-right: 15rpx; } - &.plantform-image{ + + &.plantform-image { margin-left: 15rpx; } } - .menu-text{ + + .menu-text { margin-left: 10rpx; - .title{ + + .title { color: #333333; font-weight: bold; font-size: 26rpx; - .merchant{ + + .merchant { color: #E93323; } - .plantform{ + + .plantform { color: #FFC552; } } - .info{ + + .info { color: #999999; font-size: 22rpx; margin-top: 5rpx; @@ -1067,6 +1324,7 @@ } } } + .page-footer { position: fixed; bottom: 0; @@ -1083,9 +1341,11 @@ box-shadow: 0px 0px 17rpx 1rpx rgba(206, 206, 206, 0.32); padding-bottom: constant(safe-area-inset-bottom); ///兼容 IOS<11.2/ padding-bottom: env(safe-area-inset-bottom); ///兼容 IOS>11.2/ - &.filter{ + + &.filter { filter: blur(2rpx); } + .foot-item { display: flex; width: max-content; @@ -1093,6 +1353,7 @@ justify-content: center; flex-direction: column; position: relative; + .count-num { position: absolute; display: flex; @@ -1109,14 +1370,16 @@ padding: 4rpx; } } + .foot-item image { height: 50rpx; width: 50rpx; text-align: center; margin: 0 auto; } + .foot-item .txt { font-size: 24rpx; } } - + \ No newline at end of file diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue new file mode 100644 index 0000000..2e3c706 --- /dev/null +++ b/pages/users/login/login_copy.vue @@ -0,0 +1,1307 @@ + + + \ No newline at end of file diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index 7e5d6f9..08702b2 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -12,7 +12,8 @@ v-if="addressInfo.is_default">[默认]{{addressInfo.province}}{{addressInfo.city}}{{addressInfo.district}}{{addressInfo.street || ''}}{{addressInfo.detail}} - + 设置收货地址 @@ -71,7 +72,8 @@ class="price">¥{{ (goods.productPresellAttr.final_price * goods.cart_num).toFixed(2) }} - {{ goods.productPresell.final_start_time | filterDay}}开始支付尾款 + {{ goods.productPresell.final_start_time | filterDay}}开始支付尾款 + @@ -101,8 +103,8 @@ 不支持快递 - 不支持到店核销 - + 不支持到店核销 + @@ -116,7 +118,9 @@ 配送方式 - + {{item.order.isTake==0 ? deliveryName :'到店核销'}} @@ -133,7 +137,8 @@ - + 快递费用 (尾款阶段) @@ -187,21 +192,23 @@ - - + + * - {{ item.titleConfig.value }} - + {{ item.titleConfig.value }} + - +