diff --git a/.gitignore b/.gitignore
index 15d0189..ee0a644 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,27 @@
-.hbuilderx
-.history
-.idea
+
+.DS_Store
+node_modules/
+unpackage/
+dist/
+.history/
env.js
-node_moudel
-package-lock.json
\ No newline at end of file
+yarn.lock
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.project
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw*
diff --git a/App.vue b/App.vue
deleted file mode 100644
index ce2bac1..0000000
--- a/App.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 99c049b..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM nginx
-COPY unpackage/dist/build/h5 /usr/share/nginx/html
-COPY nginx.conf /etc/nginx/conf.d/default.conf
-EXPOSE 80
diff --git a/README.md b/README.md
index 4a83697..857a408 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-17 11:30:06
* @LastEditors: ch
- * @LastEditTime: 2022-03-22 18:07:54
+ * @LastEditTime: 2022-05-23 21:18:34
* @Description: file content
-->
# shopping-app
diff --git a/babel.config.js b/babel.config.js
new file mode 100644
index 0000000..dc4690a
--- /dev/null
+++ b/babel.config.js
@@ -0,0 +1,63 @@
+const plugins = []
+
+if (process.env.UNI_OPT_TREESHAKINGNG) {
+ plugins.push(require('@dcloudio/vue-cli-plugin-uni-optimize/packages/babel-plugin-uni-api/index.js'))
+}
+
+if (
+ (
+ process.env.UNI_PLATFORM === 'app-plus' &&
+ process.env.UNI_USING_V8
+ ) ||
+ (
+ process.env.UNI_PLATFORM === 'h5' &&
+ process.env.UNI_H5_BROWSER === 'builtin'
+ )
+) {
+ const path = require('path')
+
+ const isWin = /^win/.test(process.platform)
+
+ const normalizePath = path => (isWin ? path.replace(/\\/g, '/') : path)
+
+ const input = normalizePath(process.env.UNI_INPUT_DIR)
+ try {
+ plugins.push([
+ require('@dcloudio/vue-cli-plugin-hbuilderx/packages/babel-plugin-console'),
+ {
+ file (file) {
+ file = normalizePath(file)
+ if (file.indexOf(input) === 0) {
+ return path.relative(input, file)
+ }
+ return false
+ }
+ }
+ ])
+ } catch (e) {}
+}
+
+process.UNI_LIBRARIES = process.UNI_LIBRARIES || ['@dcloudio/uni-ui']
+process.UNI_LIBRARIES.forEach(libraryName => {
+ plugins.push([
+ 'import',
+ {
+ 'libraryName': libraryName,
+ 'customName': (name) => {
+ return `${libraryName}/lib/${name}/${name}`
+ }
+ }
+ ])
+})
+module.exports = {
+ presets: [
+ [
+ '@vue/app',
+ {
+ modules: 'commonjs',
+ useBuiltIns: process.env.UNI_PLATFORM === 'h5' ? 'usage' : 'entry'
+ }
+ ]
+ ],
+ plugins
+}
diff --git a/deploy.yaml b/deploy.yaml
deleted file mode 100644
index 81bd20c..0000000
--- a/deploy.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-kind: Deployment
-apiVersion: apps/v1
-metadata:
- labels:
- app: $IMAGES
- name: $IMAGES
- namespace: yanxuan
-spec:
- progressDeadlineSeconds: 600
- replicas: 1
- selector:
- matchLabels:
- app: $IMAGES
- strategy:
- type: RollingUpdate
- rollingUpdate:
- maxUnavailable: 25%
- maxSurge: 25%
- template:
- metadata:
- labels:
- app: $IMAGES
- spec:
- imagePullSecrets:
- - name: aliyun-docker-hub
- containers:
- - image: '$REGISTRY/$DOCKERHUB_NAMESPACE/$IMAGES:$BUILD_NUMBER'
- name: app
- ports:
- - containerPort: $JAR_PORD
- protocol: TCP
- resources:
- limits:
- cpu: '0.5'
- memory: 500Mi
- terminationMessagePath: /dev/termination-log
- terminationMessagePolicy: File
- dnsPolicy: ClusterFirst
- restartPolicy: Always
- terminationGracePeriodSeconds: 30
----
-kind: Service
-apiVersion: v1
-metadata:
- name: $IMAGES
- namespace: yanxuan
-spec:
- ports:
- - port: 80
- protocol: TCP
- targetPort: 80
- selector:
- app: $IMAGES
- type: ClusterIP
diff --git a/env.config.js b/env.config.js
index 3551c41..4efb30a 100644
--- a/env.config.js
+++ b/env.config.js
@@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-05-05 14:40:00
* @LastEditors: ch
- * @LastEditTime: 2022-05-23 15:31:49
+ * @LastEditTime: 2022-05-23 21:15:35
* @Description: 根据git分支生成对应环境的环境变量
* 开发时如果环境变量换了,可以不用重启服务,直接运行node env.config.js即可
*/
@@ -38,5 +38,5 @@ for(key in envConfig){
if(!curEnvConfig){
curEnvConfig = envConfig.dev;
}
-fs.writeFileSync(`${path.resolve(__dirname, './common/config')}/env.js`,
+fs.writeFileSync(`${path.resolve(__dirname, './src/common/config')}/env.js`,
`const ENV = ${JSON.stringify(curEnvConfig)}; export default ENV;`);
diff --git a/index.html b/index.html
deleted file mode 100644
index 43a3529..0000000
--- a/index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/nginx.conf b/nginx.conf
deleted file mode 100644
index 64b8037..0000000
--- a/nginx.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-server {
- listen 80;
- listen [::]:80;
- server_name localhost default_server;
- client_max_body_size 200m;
-
- location / {
- if ($request_filename ~* .*\.(?:htm|html)$) {
- add_header Cache-Control "no-store";
- }
- root /usr/share/nginx/html;
- try_files $uri @index ;
- }
-
-
-
-
- location @index {
- add_header Cache-Control "no-store" ;
- root /usr/share/nginx/html;
- index index.html index.htm;
- try_files $uri/index.html /index.html;
- }
-
- error_page 405 =200 $uri;
-}
diff --git a/package.json b/package.json
index 2c561a2..b1c170d 100644
--- a/package.json
+++ b/package.json
@@ -1,30 +1,112 @@
{
- "name": "shopping-app",
- "version": "1.0.0",
- "description": "严选",
- "main": "main.js",
+ "name": "shop-app",
+ "version": "0.1.0",
+ "private": true,
"scripts": {
- "build:test": "node env.config.js --ENV:test",
- "build:beta": "node env.config.js --ENV:beta",
- "build:prod": "node env.config.js --ENV:prod"
+ "serve": "npm run dev:h5",
+ "build": "npm run build:h5",
+ "build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build",
+ "build:custom": "cross-env NODE_ENV=production uniapp-cli custom",
+ "build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 vue-cli-service uni-build",
+ "build:mp-360": "cross-env NODE_ENV=production UNI_PLATFORM=mp-360 vue-cli-service uni-build",
+ "build:mp-alipay": "cross-env NODE_ENV=production UNI_PLATFORM=mp-alipay vue-cli-service uni-build",
+ "build:mp-baidu": "cross-env NODE_ENV=production UNI_PLATFORM=mp-baidu vue-cli-service uni-build",
+ "build:mp-jd": "cross-env NODE_ENV=production UNI_PLATFORM=mp-jd vue-cli-service uni-build",
+ "build:mp-kuaishou": "cross-env NODE_ENV=production UNI_PLATFORM=mp-kuaishou vue-cli-service uni-build",
+ "build:mp-lark": "cross-env NODE_ENV=production UNI_PLATFORM=mp-lark vue-cli-service uni-build",
+ "build:mp-qq": "cross-env NODE_ENV=production UNI_PLATFORM=mp-qq vue-cli-service uni-build",
+ "build:mp-toutiao": "cross-env NODE_ENV=production UNI_PLATFORM=mp-toutiao vue-cli-service uni-build",
+ "build:mp-weixin": "cross-env NODE_ENV=production UNI_PLATFORM=mp-weixin vue-cli-service uni-build",
+ "build:mp-xhs": "cross-env NODE_ENV=production UNI_PLATFORM=mp-xhs vue-cli-service uni-build",
+ "build:quickapp-native": "cross-env NODE_ENV=production UNI_PLATFORM=quickapp-native vue-cli-service uni-build",
+ "build:quickapp-webview": "cross-env NODE_ENV=production UNI_PLATFORM=quickapp-webview vue-cli-service uni-build",
+ "build:quickapp-webview-huawei": "cross-env NODE_ENV=production UNI_PLATFORM=quickapp-webview-huawei vue-cli-service uni-build",
+ "build:quickapp-webview-union": "cross-env NODE_ENV=production UNI_PLATFORM=quickapp-webview-union vue-cli-service uni-build",
+ "dev:app-plus": "cross-env NODE_ENV=development UNI_PLATFORM=app-plus vue-cli-service uni-build --watch",
+ "dev:custom": "cross-env NODE_ENV=development uniapp-cli custom",
+ "dev:h5": "cross-env NODE_ENV=development UNI_PLATFORM=h5 vue-cli-service uni-serve",
+ "dev:mp-360": "cross-env NODE_ENV=development UNI_PLATFORM=mp-360 vue-cli-service uni-build --watch",
+ "dev:mp-alipay": "cross-env NODE_ENV=development UNI_PLATFORM=mp-alipay vue-cli-service uni-build --watch",
+ "dev:mp-baidu": "cross-env NODE_ENV=development UNI_PLATFORM=mp-baidu vue-cli-service uni-build --watch",
+ "dev:mp-jd": "cross-env NODE_ENV=development UNI_PLATFORM=mp-jd vue-cli-service uni-build --watch",
+ "dev:mp-kuaishou": "cross-env NODE_ENV=development UNI_PLATFORM=mp-kuaishou vue-cli-service uni-build --watch",
+ "dev:mp-lark": "cross-env NODE_ENV=development UNI_PLATFORM=mp-lark vue-cli-service uni-build --watch",
+ "dev:mp-qq": "cross-env NODE_ENV=development UNI_PLATFORM=mp-qq vue-cli-service uni-build --watch",
+ "dev:mp-toutiao": "cross-env NODE_ENV=development UNI_PLATFORM=mp-toutiao vue-cli-service uni-build --watch",
+ "dev:mp-weixin": "cross-env NODE_ENV=development UNI_PLATFORM=mp-weixin vue-cli-service uni-build --watch",
+ "dev:mp-xhs": "cross-env NODE_ENV=development UNI_PLATFORM=mp-xhs vue-cli-service uni-build --watch",
+ "dev:quickapp-native": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp-native vue-cli-service uni-build --watch",
+ "dev:quickapp-webview": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp-webview vue-cli-service uni-build --watch",
+ "dev:quickapp-webview-huawei": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp-webview-huawei vue-cli-service uni-build --watch",
+ "dev:quickapp-webview-union": "cross-env NODE_ENV=development UNI_PLATFORM=quickapp-webview-union vue-cli-service uni-build --watch",
+ "info": "node node_modules/@dcloudio/vue-cli-plugin-uni/commands/info.js",
+ "serve:quickapp-native": "node node_modules/@dcloudio/uni-quickapp-native/bin/serve.js",
+ "test:android": "cross-env UNI_PLATFORM=app-plus UNI_OS_NAME=android jest -i",
+ "test:h5": "cross-env UNI_PLATFORM=h5 jest -i",
+ "test:ios": "cross-env UNI_PLATFORM=app-plus UNI_OS_NAME=ios jest -i",
+ "test:mp-baidu": "cross-env UNI_PLATFORM=mp-baidu jest -i",
+ "test:mp-weixin": "cross-env UNI_PLATFORM=mp-weixin jest -i"
},
- "repository": {
- "type": "git",
- "url": "http://internel-git.mashibing.cn/chenhui/shopping-app.git"
- },
- "keywords": [],
- "author": "",
- "license": "ISC",
"dependencies": {
+ "@dcloudio/uni-app-plus": "^2.0.1-34720220422002",
+ "@dcloudio/uni-h5": "^2.0.1-34720220422002",
+ "@dcloudio/uni-helper-json": "*",
+ "@dcloudio/uni-i18n": "^2.0.1-34720220422002",
+ "@dcloudio/uni-mp-360": "^2.0.1-34720220422002",
+ "@dcloudio/uni-mp-alipay": "^2.0.1-34720220422002",
+ "@dcloudio/uni-mp-baidu": "^2.0.1-34720220422002",
+ "@dcloudio/uni-mp-jd": "^2.0.1-34720220422002",
+ "@dcloudio/uni-mp-kuaishou": "^2.0.1-34720220422002",
+ "@dcloudio/uni-mp-lark": "^2.0.1-34720220422002",
+ "@dcloudio/uni-mp-qq": "^2.0.1-34720220422002",
+ "@dcloudio/uni-mp-toutiao": "^2.0.1-34720220422002",
+ "@dcloudio/uni-mp-vue": "^2.0.1-34720220422002",
+ "@dcloudio/uni-mp-weixin": "^2.0.1-34720220422002",
+ "@dcloudio/uni-mp-xhs": "^2.0.1-34720220422002",
+ "@dcloudio/uni-quickapp-native": "^2.0.1-34720220422002",
+ "@dcloudio/uni-quickapp-webview": "^2.0.1-34720220422002",
+ "@dcloudio/uni-stat": "^2.0.1-34720220422002",
+ "@vue/shared": "^3.0.0",
+ "core-js": "^3.6.5",
+ "flyio": "^0.6.2",
+ "regenerator-runtime": "^0.12.1",
+ "vue": "^2.6.11",
+ "vuex": "^3.2.0",
"js-util-all": "^1.0.6",
"mp-html": "^2.2.2",
"uni-read-pages": "^1.0.5",
"uni-simple-router": "^2.0.7",
- "uview-ui": "^2.0.29",
- "vuex": "^3.6.2"
+ "uview-ui": "^2.0.29"
},
"devDependencies": {
- "@dcloudio/uni-helper-json": "^1.0.13",
- "git-repo-info": "^2.1.1"
+ "@babel/runtime": "~7.12.0",
+ "@dcloudio/types": "^2.6.7",
+ "@dcloudio/uni-automator": "^2.0.1-34720220422002",
+ "@dcloudio/uni-cli-i18n": "^2.0.1-34720220422002",
+ "@dcloudio/uni-cli-shared": "^2.0.1-34720220422002",
+ "@dcloudio/uni-migration": "^2.0.1-34720220422002",
+ "@dcloudio/uni-template-compiler": "^2.0.1-34720220422002",
+ "@dcloudio/vue-cli-plugin-hbuilderx": "^2.0.1-34720220422002",
+ "@dcloudio/vue-cli-plugin-uni": "^2.0.1-34720220422002",
+ "@dcloudio/vue-cli-plugin-uni-optimize": "^2.0.1-34720220422002",
+ "@dcloudio/webpack-uni-mp-loader": "^2.0.1-34720220422002",
+ "@dcloudio/webpack-uni-pages-loader": "^2.0.1-34720220422002",
+ "@vue/cli-plugin-babel": "~4.5.15",
+ "@vue/cli-service": "~4.5.15",
+ "babel-plugin-import": "^1.11.0",
+ "cross-env": "^7.0.2",
+ "jest": "^25.4.0",
+ "mini-types": "*",
+ "miniprogram-api-typings": "*",
+ "postcss-comment": "^2.0.0",
+ "sass": "^1.52.1",
+ "vue-template-compiler": "^2.6.11"
+ },
+ "browserslist": [
+ "Android >= 4.4",
+ "ios >= 9"
+ ],
+ "uni-app": {
+ "scripts": {}
}
}
diff --git a/postcss.config.js b/postcss.config.js
new file mode 100644
index 0000000..136478b
--- /dev/null
+++ b/postcss.config.js
@@ -0,0 +1,22 @@
+const path = require('path')
+module.exports = {
+ parser: require('postcss-comment'),
+ plugins: [
+ require('postcss-import')({
+ resolve (id, basedir, importOptions) {
+ if (id.startsWith('~@/')) {
+ return path.resolve(process.env.UNI_INPUT_DIR, id.substr(3))
+ } else if (id.startsWith('@/')) {
+ return path.resolve(process.env.UNI_INPUT_DIR, id.substr(2))
+ } else if (id.startsWith('/') && !id.startsWith('//')) {
+ return path.resolve(process.env.UNI_INPUT_DIR, id.substr(1))
+ }
+ return id
+ }
+ }),
+ require('autoprefixer')({
+ remove: process.env.UNI_PLATFORM !== 'h5'
+ }),
+ require('@dcloudio/vue-cli-plugin-uni/packages/postcss')
+ ]
+}
diff --git a/public/index.html b/public/index.html
new file mode 100644
index 0000000..ff730ce
--- /dev/null
+++ b/public/index.html
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+ <%= htmlWebpackPlugin.options.title %>
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
new file mode 100644
index 0000000..4efbe61
--- /dev/null
+++ b/src/App.vue
@@ -0,0 +1,25 @@
+
+
+
+
diff --git a/common/api/account.js b/src/common/api/account.js
similarity index 100%
rename from common/api/account.js
rename to src/common/api/account.js
diff --git a/common/api/base.js b/src/common/api/base.js
similarity index 100%
rename from common/api/base.js
rename to src/common/api/base.js
diff --git a/common/api/cart.js b/src/common/api/cart.js
similarity index 100%
rename from common/api/cart.js
rename to src/common/api/cart.js
diff --git a/common/api/goods.js b/src/common/api/goods.js
similarity index 100%
rename from common/api/goods.js
rename to src/common/api/goods.js
diff --git a/common/api/im.js b/src/common/api/im.js
similarity index 100%
rename from common/api/im.js
rename to src/common/api/im.js
diff --git a/common/api/index.js b/src/common/api/index.js
similarity index 100%
rename from common/api/index.js
rename to src/common/api/index.js
diff --git a/common/api/order.js b/src/common/api/order.js
similarity index 100%
rename from common/api/order.js
rename to src/common/api/order.js
diff --git a/common/api/oss.js b/src/common/api/oss.js
similarity index 100%
rename from common/api/oss.js
rename to src/common/api/oss.js
diff --git a/common/api/seckill.js b/src/common/api/seckill.js
similarity index 100%
rename from common/api/seckill.js
rename to src/common/api/seckill.js
diff --git a/common/api/wx.js b/src/common/api/wx.js
similarity index 100%
rename from common/api/wx.js
rename to src/common/api/wx.js
diff --git a/common/dicts/area.json b/src/common/dicts/area.json
similarity index 100%
rename from common/dicts/area.json
rename to src/common/dicts/area.json
diff --git a/common/dicts/im.js b/src/common/dicts/im.js
similarity index 100%
rename from common/dicts/im.js
rename to src/common/dicts/im.js
diff --git a/common/plugins/emoji.js b/src/common/plugins/emoji.js
similarity index 100%
rename from common/plugins/emoji.js
rename to src/common/plugins/emoji.js
diff --git a/common/plugins/msbIm.js b/src/common/plugins/msbIm.js
similarity index 100%
rename from common/plugins/msbIm.js
rename to src/common/plugins/msbIm.js
diff --git a/common/plugins/msbUniRequest.js b/src/common/plugins/msbUniRequest.js
similarity index 100%
rename from common/plugins/msbUniRequest.js
rename to src/common/plugins/msbUniRequest.js
diff --git a/common/router/index.js b/src/common/router/index.js
similarity index 100%
rename from common/router/index.js
rename to src/common/router/index.js
diff --git a/common/store/index.js b/src/common/store/index.js
similarity index 100%
rename from common/store/index.js
rename to src/common/store/index.js
diff --git a/common/utils/im.js b/src/common/utils/im.js
similarity index 100%
rename from common/utils/im.js
rename to src/common/utils/im.js
diff --git a/common/utils/index.js b/src/common/utils/index.js
similarity index 100%
rename from common/utils/index.js
rename to src/common/utils/index.js
diff --git a/common/utils/pay.js b/src/common/utils/pay.js
similarity index 100%
rename from common/utils/pay.js
rename to src/common/utils/pay.js
diff --git a/common/utils/requset.js b/src/common/utils/requset.js
similarity index 100%
rename from common/utils/requset.js
rename to src/common/utils/requset.js
diff --git a/common/utils/utils.js b/src/common/utils/utils.js
similarity index 100%
rename from common/utils/utils.js
rename to src/common/utils/utils.js
diff --git a/common/utils/wxpay.js b/src/common/utils/wxpay.js
similarity index 100%
rename from common/utils/wxpay.js
rename to src/common/utils/wxpay.js
diff --git a/components/BsChoiceGoods.vue b/src/components/BsChoiceGoods.vue
similarity index 100%
rename from components/BsChoiceGoods.vue
rename to src/components/BsChoiceGoods.vue
diff --git a/components/BsEmpty.vue b/src/components/BsEmpty.vue
similarity index 100%
rename from components/BsEmpty.vue
rename to src/components/BsEmpty.vue
diff --git a/components/BsPay.vue b/src/components/BsPay.vue
similarity index 100%
rename from components/BsPay.vue
rename to src/components/BsPay.vue
diff --git a/components/BsSelectCity.vue b/src/components/BsSelectCity.vue
similarity index 100%
rename from components/BsSelectCity.vue
rename to src/components/BsSelectCity.vue
diff --git a/components/UiButton.vue b/src/components/UiButton.vue
similarity index 100%
rename from components/UiButton.vue
rename to src/components/UiButton.vue
diff --git a/components/UiCell.vue b/src/components/UiCell.vue
similarity index 100%
rename from components/UiCell.vue
rename to src/components/UiCell.vue
diff --git a/components/UiConfirm.vue b/src/components/UiConfirm.vue
similarity index 100%
rename from components/UiConfirm.vue
rename to src/components/UiConfirm.vue
diff --git a/components/UiCopy.vue b/src/components/UiCopy.vue
similarity index 100%
rename from components/UiCopy.vue
rename to src/components/UiCopy.vue
diff --git a/components/UiGoodsGroup.vue b/src/components/UiGoodsGroup.vue
similarity index 98%
rename from components/UiGoodsGroup.vue
rename to src/components/UiGoodsGroup.vue
index f3f2e2e..e124f8a 100644
--- a/components/UiGoodsGroup.vue
+++ b/src/components/UiGoodsGroup.vue
@@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-04-07 17:22:44
* @LastEditors: ch
- * @LastEditTime: 2022-05-07 19:46:04
+ * @LastEditTime: 2022-05-23 18:17:28
* @Description: file content
-->
@@ -175,7 +175,7 @@ export default {
}
}
}
-/deep/ {
+::deep {
.goods-item--pirce{
text{
font-size: $font-size-lg;
diff --git a/components/UiGoodsInfo.vue b/src/components/UiGoodsInfo.vue
similarity index 97%
rename from components/UiGoodsInfo.vue
rename to src/components/UiGoodsInfo.vue
index 0fa7f12..d942509 100644
--- a/components/UiGoodsInfo.vue
+++ b/src/components/UiGoodsInfo.vue
@@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-31 14:49:33
* @LastEditors: ch
- * @LastEditTime: 2022-04-22 18:24:57
+ * @LastEditTime: 2022-05-23 18:17:30
* @Description: file content
-->
@@ -88,7 +88,7 @@ export default {
}
}
}
-/deep/{
+::deep{
.ui-money{
text{
font-size: $font-size-base;
diff --git a/components/UiGoodsInfoMax.vue b/src/components/UiGoodsInfoMax.vue
similarity index 97%
rename from components/UiGoodsInfoMax.vue
rename to src/components/UiGoodsInfoMax.vue
index 5f87f9e..24fd6cb 100644
--- a/components/UiGoodsInfoMax.vue
+++ b/src/components/UiGoodsInfoMax.vue
@@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-04-22 16:48:11
* @LastEditors: ch
- * @LastEditTime: 2022-04-22 20:52:22
+ * @LastEditTime: 2022-05-23 18:17:32
* @Description: file content
-->
@@ -81,7 +81,7 @@ export default {
margin-left: 60rpx;
}
}
-/deep/{
+::deep{
.ui-money{
text{
font-size: $font-size-base;
diff --git a/components/UiMoney.vue b/src/components/UiMoney.vue
similarity index 100%
rename from components/UiMoney.vue
rename to src/components/UiMoney.vue
diff --git a/components/UiPageHeader.vue b/src/components/UiPageHeader.vue
similarity index 100%
rename from components/UiPageHeader.vue
rename to src/components/UiPageHeader.vue
diff --git a/components/UiRadioPicker.vue b/src/components/UiRadioPicker.vue
similarity index 100%
rename from components/UiRadioPicker.vue
rename to src/components/UiRadioPicker.vue
diff --git a/components/UiWhiteBox.vue b/src/components/UiWhiteBox.vue
similarity index 100%
rename from components/UiWhiteBox.vue
rename to src/components/UiWhiteBox.vue
diff --git a/main.js b/src/main.js
similarity index 98%
rename from main.js
rename to src/main.js
index 8334387..6db3ec4 100644
--- a/main.js
+++ b/src/main.js
@@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2021-07-26 23:22:16
* @LastEditors: ch
- * @LastEditTime: 2022-05-23 15:11:23
+ * @LastEditTime: 2022-05-23 20:55:47
* @Description: file content
*/
import Vue from 'vue';
diff --git a/manifest.json b/src/manifest.json
similarity index 100%
rename from manifest.json
rename to src/manifest.json
diff --git a/src/manifest_old.json b/src/manifest_old.json
new file mode 100644
index 0000000..972bd1e
--- /dev/null
+++ b/src/manifest_old.json
@@ -0,0 +1,75 @@
+{
+ "name": "",
+ "appid": "",
+ "description": "",
+ "versionName": "1.0.0",
+ "versionCode": "100",
+ "transformPx": false,
+ "app-plus": { /* 5+App特有相关 */
+ "usingComponents": true,
+ "splashscreen": {
+ "alwaysShowBeforeRender": true,
+ "waiting": true,
+ "autoclose": true,
+ "delay": 0
+ },
+ "modules": { /* 模块配置 */
+
+ },
+ "distribute": { /* 应用发布信息 */
+ "android": { /* android打包配置 */
+ "permissions": ["",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ "",
+ ""
+ ]
+ },
+ "ios": { /* ios打包配置 */
+
+ },
+ "sdkConfigs": { /* SDK配置 */
+
+ }
+ }
+ },
+ "quickapp": { /* 快应用特有相关 */
+
+ },
+ "mp-weixin": { /* 微信小程序特有相关 */
+ "appid": "",
+ "setting": {
+ "urlCheck": false
+ },
+ "usingComponents": true
+ },
+ "mp-alipay" : {
+ "usingComponents" : true
+ },
+ "mp-baidu" : {
+ "usingComponents" : true
+ },
+ "mp-toutiao" : {
+ "usingComponents" : true
+ },
+ "mp-qq" : {
+ "usingComponents" : true
+ }
+}
diff --git a/pages.json b/src/pages.json
similarity index 100%
rename from pages.json
rename to src/pages.json
diff --git a/pages/account/address/create.vue b/src/pages/account/address/create.vue
similarity index 98%
rename from pages/account/address/create.vue
rename to src/pages/account/address/create.vue
index 6c2f2fe..2cec171 100644
--- a/pages/account/address/create.vue
+++ b/src/pages/account/address/create.vue
@@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-22 14:12:18
* @LastEditors: ch
- * @LastEditTime: 2022-04-29 23:09:52
+ * @LastEditTime: 2022-05-23 18:17:36
* @Description: file content
-->
@@ -126,7 +126,7 @@ page {
left: 30rpx;
width: 670rpx;
}
-/deep/ {
+::deep {
.form--city .ui-cell{
padding: 0 40rpx;
}
diff --git a/pages/account/address/edit.vue b/src/pages/account/address/edit.vue
similarity index 98%
rename from pages/account/address/edit.vue
rename to src/pages/account/address/edit.vue
index 431d79f..0867a20 100644
--- a/pages/account/address/edit.vue
+++ b/src/pages/account/address/edit.vue
@@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-22 14:12:18
* @LastEditors: ch
- * @LastEditTime: 2022-05-07 19:07:02
+ * @LastEditTime: 2022-05-23 18:17:37
* @Description: file content
-->
@@ -160,7 +160,7 @@ page {
left: 30rpx;
width: 670rpx;
}
-/deep/ {
+::deep {
.del-address .ui-cell--title{
color: $color-yellow3;
}
diff --git a/pages/account/address/list.vue b/src/pages/account/address/list.vue
similarity index 100%
rename from pages/account/address/list.vue
rename to src/pages/account/address/list.vue
diff --git a/pages/account/index.vue b/src/pages/account/index.vue
similarity index 99%
rename from pages/account/index.vue
rename to src/pages/account/index.vue
index dc49fd8..231f5e4 100644
--- a/pages/account/index.vue
+++ b/src/pages/account/index.vue
@@ -3,7 +3,7 @@
components: { UiCell },: ch
* @Date: 2019-08-22 19:41:20
* @LastEditors: ch
- * @LastEditTime: 2022-05-21 16:00:44
+ * @LastEditTime: 2022-05-23 18:17:35
* @Description: file content
-->
@@ -209,7 +209,7 @@ page {
border: 0;
}
}
-/deep/{
+::deep{
.header--cell .ui-cell--title{
font-weight: bold;
font-size: $font-size-lg;
diff --git a/pages/account/message/chat/components/Footer.vue b/src/pages/account/message/chat/components/Footer.vue
similarity index 100%
rename from pages/account/message/chat/components/Footer.vue
rename to src/pages/account/message/chat/components/Footer.vue
diff --git a/pages/account/message/chat/components/GoodsInfo.vue b/src/pages/account/message/chat/components/GoodsInfo.vue
similarity index 97%
rename from pages/account/message/chat/components/GoodsInfo.vue
rename to src/pages/account/message/chat/components/GoodsInfo.vue
index b5cfd07..89685e7 100644
--- a/pages/account/message/chat/components/GoodsInfo.vue
+++ b/src/pages/account/message/chat/components/GoodsInfo.vue
@@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-05-13 15:57:31
* @LastEditors: ch
- * @LastEditTime: 2022-05-23 11:28:04
+ * @LastEditTime: 2022-05-23 18:17:38
* @Description: file content
-->
@@ -85,7 +85,7 @@ export default {
right:30rpx;
}
}
-/deep/{
+::deep{
.product--con-price{
text{
color: #FF512B;
diff --git a/pages/account/message/chat/components/OrderInfo.vue b/src/pages/account/message/chat/components/OrderInfo.vue
similarity index 97%
rename from pages/account/message/chat/components/OrderInfo.vue
rename to src/pages/account/message/chat/components/OrderInfo.vue
index 4a8473a..b201732 100644
--- a/pages/account/message/chat/components/OrderInfo.vue
+++ b/src/pages/account/message/chat/components/OrderInfo.vue
@@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-05-14 14:00:14
* @LastEditors: ch
- * @LastEditTime: 2022-05-14 15:57:30
+ * @LastEditTime: 2022-05-23 18:17:39
* @Description: file content
-->
@@ -78,7 +78,7 @@ export default {
margin-top: 26rpx;
}
}
-/deep/{
+::deep{
.order--con-price{
text{
color: #FF512B;
diff --git a/pages/account/message/chat/index.vue b/src/pages/account/message/chat/index.vue
similarity index 100%
rename from pages/account/message/chat/index.vue
rename to src/pages/account/message/chat/index.vue
diff --git a/pages/account/message/group.vue b/src/pages/account/message/group.vue
similarity index 100%
rename from pages/account/message/group.vue
rename to src/pages/account/message/group.vue
diff --git a/pages/account/message/system.vue b/src/pages/account/message/system.vue
similarity index 100%
rename from pages/account/message/system.vue
rename to src/pages/account/message/system.vue
diff --git a/pages/account/setting/index.vue b/src/pages/account/setting/index.vue
similarity index 97%
rename from pages/account/setting/index.vue
rename to src/pages/account/setting/index.vue
index 1772624..1f3da1f 100644
--- a/pages/account/setting/index.vue
+++ b/src/pages/account/setting/index.vue
@@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-22 15:09:06
* @LastEditors: ch
- * @LastEditTime: 2022-05-21 14:18:06
+ * @LastEditTime: 2022-05-23 18:17:40
* @Description: file content
-->
@@ -91,7 +91,7 @@ page {
font-size: $font-size-lg;
}
-/deep/{
+::deep{
.userInfo .uiCell--title{
font-size: $font-size-lg;
}
diff --git a/pages/account/setting/setName.vue b/src/pages/account/setting/setName.vue
similarity index 100%
rename from pages/account/setting/setName.vue
rename to src/pages/account/setting/setName.vue
diff --git a/pages/account/setting/setUserInfo.vue b/src/pages/account/setting/setUserInfo.vue
similarity index 98%
rename from pages/account/setting/setUserInfo.vue
rename to src/pages/account/setting/setUserInfo.vue
index b59c767..a106697 100644
--- a/pages/account/setting/setUserInfo.vue
+++ b/src/pages/account/setting/setUserInfo.vue
@@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-28 15:38:23
* @LastEditors: ch
- * @LastEditTime: 2022-05-17 17:42:23
+ * @LastEditTime: 2022-05-23 18:17:41
* @Description: file content
-->
@@ -143,7 +143,7 @@ page {
border: 0;
}
}
-/deep/{
+::deep{
.userInfo .uiCell--title{
font-size: $font-size-lg;
}
diff --git a/pages/cart/cart.vue b/src/pages/cart/cart.vue
similarity index 100%
rename from pages/cart/cart.vue
rename to src/pages/cart/cart.vue
diff --git a/pages/cart/components/PageCtx.vue b/src/pages/cart/components/PageCtx.vue
similarity index 99%
rename from pages/cart/components/PageCtx.vue
rename to src/pages/cart/components/PageCtx.vue
index ae70d33..7160caa 100644
--- a/pages/cart/components/PageCtx.vue
+++ b/src/pages/cart/components/PageCtx.vue
@@ -573,7 +573,7 @@ export default {
}
-/deep/{
+::deep{
.cart-item--price{
text{
font-size: $font-size-lg;
diff --git a/pages/cart/tabBarCart.vue b/src/pages/cart/tabBarCart.vue
similarity index 100%
rename from pages/cart/tabBarCart.vue
rename to src/pages/cart/tabBarCart.vue
diff --git a/pages/goods/category.vue b/src/pages/goods/category.vue
similarity index 100%
rename from pages/goods/category.vue
rename to src/pages/goods/category.vue
diff --git a/pages/goods/detail/components/SeckillPrice.vue b/src/pages/goods/detail/components/SeckillPrice.vue
similarity index 100%
rename from pages/goods/detail/components/SeckillPrice.vue
rename to src/pages/goods/detail/components/SeckillPrice.vue
diff --git a/pages/goods/detail/components/Service.vue b/src/pages/goods/detail/components/Service.vue
similarity index 100%
rename from pages/goods/detail/components/Service.vue
rename to src/pages/goods/detail/components/Service.vue
diff --git a/pages/goods/detail/components/SkuPopup.vue b/src/pages/goods/detail/components/SkuPopup.vue
similarity index 100%
rename from pages/goods/detail/components/SkuPopup.vue
rename to src/pages/goods/detail/components/SkuPopup.vue
diff --git a/pages/goods/detail/components/SlideImage.vue b/src/pages/goods/detail/components/SlideImage.vue
similarity index 100%
rename from pages/goods/detail/components/SlideImage.vue
rename to src/pages/goods/detail/components/SlideImage.vue
diff --git a/pages/goods/detail/index.vue b/src/pages/goods/detail/index.vue
similarity index 100%
rename from pages/goods/detail/index.vue
rename to src/pages/goods/detail/index.vue
diff --git a/pages/goods/list/components/Sort.vue b/src/pages/goods/list/components/Sort.vue
similarity index 100%
rename from pages/goods/list/components/Sort.vue
rename to src/pages/goods/list/components/Sort.vue
diff --git a/pages/goods/list/index.vue b/src/pages/goods/list/index.vue
similarity index 100%
rename from pages/goods/list/index.vue
rename to src/pages/goods/list/index.vue
diff --git a/pages/goods/search.vue b/src/pages/goods/search.vue
similarity index 100%
rename from pages/goods/search.vue
rename to src/pages/goods/search.vue
diff --git a/pages/index/components/Banner.vue b/src/pages/index/components/Banner.vue
similarity index 100%
rename from pages/index/components/Banner.vue
rename to src/pages/index/components/Banner.vue
diff --git a/pages/index/components/Pick.vue b/src/pages/index/components/Pick.vue
similarity index 99%
rename from pages/index/components/Pick.vue
rename to src/pages/index/components/Pick.vue
index 5d206ac..8d6e0b6 100644
--- a/pages/index/components/Pick.vue
+++ b/src/pages/index/components/Pick.vue
@@ -165,7 +165,7 @@ export default {
margin-top: 0;
}
}
-/deep/ .price{
+::deep .price{
text{
color: $color-yellow4;
font-size: $font-size-lg;
diff --git a/pages/index/components/Seckill.vue b/src/pages/index/components/Seckill.vue
similarity index 99%
rename from pages/index/components/Seckill.vue
rename to src/pages/index/components/Seckill.vue
index a5bf0b3..d271a88 100644
--- a/pages/index/components/Seckill.vue
+++ b/src/pages/index/components/Seckill.vue
@@ -204,7 +204,7 @@ export default {
}
-/deep/ {
+::deep {
.seckill--item-pirce{
text{
color: $color-yellow4;
diff --git a/pages/index/index.vue b/src/pages/index/index.vue
similarity index 100%
rename from pages/index/index.vue
rename to src/pages/index/index.vue
diff --git a/pages/login.vue b/src/pages/login.vue
similarity index 99%
rename from pages/login.vue
rename to src/pages/login.vue
index 6922b48..e06c612 100644
--- a/pages/login.vue
+++ b/src/pages/login.vue
@@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-22 15:36:46
* @LastEditors: ch
- * @LastEditTime: 2022-05-20 14:24:29
+ * @LastEditTime: 2022-05-23 18:17:33
* @Description: file content
-->
@@ -220,7 +220,7 @@ export default {
}
}
}
-/deep/{
+::deep{
.input-placeholder{
color: $color-grey3;
}
diff --git a/pages/order/detail/components/LogisitcsInfo.vue b/src/pages/order/detail/components/LogisitcsInfo.vue
similarity index 97%
rename from pages/order/detail/components/LogisitcsInfo.vue
rename to src/pages/order/detail/components/LogisitcsInfo.vue
index 6c20ec2..409c010 100644
--- a/pages/order/detail/components/LogisitcsInfo.vue
+++ b/src/pages/order/detail/components/LogisitcsInfo.vue
@@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-04-15 16:36:02
* @LastEditors: ch
- * @LastEditTime: 2022-04-22 21:10:56
+ * @LastEditTime: 2022-05-23 18:17:46
* @Description: file content
-->
@@ -81,7 +81,7 @@ export default {
}
}
-/deep/{
+::deep{
.u-cell__body__content{
padding: 10rpx 0;
}
diff --git a/pages/order/detail/components/Operation.vue b/src/pages/order/detail/components/Operation.vue
similarity index 100%
rename from pages/order/detail/components/Operation.vue
rename to src/pages/order/detail/components/Operation.vue
diff --git a/pages/order/detail/components/OrderInfo.vue b/src/pages/order/detail/components/OrderInfo.vue
similarity index 98%
rename from pages/order/detail/components/OrderInfo.vue
rename to src/pages/order/detail/components/OrderInfo.vue
index cd6bc18..d2f762b 100644
--- a/pages/order/detail/components/OrderInfo.vue
+++ b/src/pages/order/detail/components/OrderInfo.vue
@@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-04-15 16:04:28
* @LastEditors: ch
- * @LastEditTime: 2022-04-22 15:30:50
+ * @LastEditTime: 2022-05-23 18:17:50
* @Description: file content
-->
@@ -103,7 +103,7 @@ export default {
color: $color-yellow4;
font-size: $font-size-lg;
}
-/deep/ {
+::deep {
.ui-money--price{
font-size: 36rpx;
color: $color-yellow4;
diff --git a/pages/order/detail/components/StatusTips.vue b/src/pages/order/detail/components/StatusTips.vue
similarity index 100%
rename from pages/order/detail/components/StatusTips.vue
rename to src/pages/order/detail/components/StatusTips.vue
diff --git a/pages/order/detail/index.vue b/src/pages/order/detail/index.vue
similarity index 100%
rename from pages/order/detail/index.vue
rename to src/pages/order/detail/index.vue
diff --git a/pages/order/list.vue b/src/pages/order/list.vue
similarity index 99%
rename from pages/order/list.vue
rename to src/pages/order/list.vue
index e3571b2..5b3ba74 100644
--- a/pages/order/list.vue
+++ b/src/pages/order/list.vue
@@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-22 10:58:24
* @LastEditors: ch
- * @LastEditTime: 2022-05-07 19:08:18
+ * @LastEditTime: 2022-05-23 18:17:44
* @Description: file content
-->
@@ -240,7 +240,7 @@ page {
}
}
-/deep/{
+::deep{
.orders--footer{
.ui-btn{
margin: 0 0 0 20rpx;
diff --git a/pages/order/logisitcsInfo.vue b/src/pages/order/logisitcsInfo.vue
similarity index 100%
rename from pages/order/logisitcsInfo.vue
rename to src/pages/order/logisitcsInfo.vue
diff --git a/pages/order/orderSuccess.vue b/src/pages/order/orderSuccess.vue
similarity index 100%
rename from pages/order/orderSuccess.vue
rename to src/pages/order/orderSuccess.vue
diff --git a/pages/order/payResult.vue b/src/pages/order/payResult.vue
similarity index 100%
rename from pages/order/payResult.vue
rename to src/pages/order/payResult.vue
diff --git a/pages/order/saleAfter/saleAfterApply.vue b/src/pages/order/saleAfter/saleAfterApply.vue
similarity index 100%
rename from pages/order/saleAfter/saleAfterApply.vue
rename to src/pages/order/saleAfter/saleAfterApply.vue
diff --git a/pages/order/saleAfter/saleAfterDetail/components/AwaitExamine.vue b/src/pages/order/saleAfter/saleAfterDetail/components/AwaitExamine.vue
similarity index 100%
rename from pages/order/saleAfter/saleAfterDetail/components/AwaitExamine.vue
rename to src/pages/order/saleAfter/saleAfterDetail/components/AwaitExamine.vue
diff --git a/pages/order/saleAfter/saleAfterDetail/components/GoodsInfo.vue b/src/pages/order/saleAfter/saleAfterDetail/components/GoodsInfo.vue
similarity index 100%
rename from pages/order/saleAfter/saleAfterDetail/components/GoodsInfo.vue
rename to src/pages/order/saleAfter/saleAfterDetail/components/GoodsInfo.vue
diff --git a/pages/order/saleAfter/saleAfterDetail/components/LogisticsInfo.vue b/src/pages/order/saleAfter/saleAfterDetail/components/LogisticsInfo.vue
similarity index 100%
rename from pages/order/saleAfter/saleAfterDetail/components/LogisticsInfo.vue
rename to src/pages/order/saleAfter/saleAfterDetail/components/LogisticsInfo.vue
diff --git a/pages/order/saleAfter/saleAfterDetail/components/StatusTips.vue b/src/pages/order/saleAfter/saleAfterDetail/components/StatusTips.vue
similarity index 100%
rename from pages/order/saleAfter/saleAfterDetail/components/StatusTips.vue
rename to src/pages/order/saleAfter/saleAfterDetail/components/StatusTips.vue
diff --git a/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue b/src/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
similarity index 99%
rename from pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
rename to src/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
index b8d3cfd..7615e76 100644
--- a/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
+++ b/src/pages/order/saleAfter/saleAfterDetail/components/SubmitLogistics.vue
@@ -191,7 +191,7 @@ export default {
padding: 0 30rpx;
}
.address{
- /deep/.u-cell__body__content{
+ ::deep.u-cell__body__content{
padding: 10rpx 0;
}
diff --git a/pages/order/saleAfter/saleAfterDetail/index.vue b/src/pages/order/saleAfter/saleAfterDetail/index.vue
similarity index 100%
rename from pages/order/saleAfter/saleAfterDetail/index.vue
rename to src/pages/order/saleAfter/saleAfterDetail/index.vue
diff --git a/pages/order/saleAfter/saleAfterEdit.vue b/src/pages/order/saleAfter/saleAfterEdit.vue
similarity index 100%
rename from pages/order/saleAfter/saleAfterEdit.vue
rename to src/pages/order/saleAfter/saleAfterEdit.vue
diff --git a/pages/order/saleAfter/saleAfterList.vue b/src/pages/order/saleAfter/saleAfterList.vue
similarity index 100%
rename from pages/order/saleAfter/saleAfterList.vue
rename to src/pages/order/saleAfter/saleAfterList.vue
diff --git a/pages/order/saleAfter/saleAfterSelect.vue b/src/pages/order/saleAfter/saleAfterSelect.vue
similarity index 100%
rename from pages/order/saleAfter/saleAfterSelect.vue
rename to src/pages/order/saleAfter/saleAfterSelect.vue
diff --git a/pages/order/submit.vue b/src/pages/order/submit.vue
similarity index 99%
rename from pages/order/submit.vue
rename to src/pages/order/submit.vue
index 6adfd92..362462a 100644
--- a/pages/order/submit.vue
+++ b/src/pages/order/submit.vue
@@ -2,7 +2,7 @@
* @Author: ch
* @Date: 2022-03-20 14:14:53
* @LastEditors: ch
- * @LastEditTime: 2022-05-17 14:48:12
+ * @LastEditTime: 2022-05-23 18:17:45
* @Description: file content
-->
@@ -198,7 +198,7 @@ page {