diff --git a/README.md b/README.md index a058952..6cac505 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,9 @@ # alipay-scan-code-front-end ## 项目说明 @@ -23,12 +23,28 @@ npm run dev npm run build ``` +### 项目本地调试 + +``` +运行成功后 本地调试首次进入会进入到 http://localhost:8080/#/404 404页面 +因为当前url还没有参数, 此时需要手动在url后面添加需要的参数, +例子: http://localhost:8080/#/index?goodsNo=889&userId=1 +其中 goodsNo是商品的no, userId是用户的id, 这两个参数后面接口都会用到 +以上在线上环境不需要配置,因为二维码会自动把这两个参数添加上去 +``` + ### 项目代码编写规范(暂时想到这些,后面根据项目情况补充说明) - css类名: 小写驼峰 中间用 - 隔开 - js函数方法: 开头小写后面开头大写驼峰 - .vue 文件命名: 统一大写驼峰 - 常量命名: 全部大写 以_拼接, 具体例子见: /src/config/models下的文件 + +### 项目分支管理 +- master: 不可在此分支做任何修改, 只能合并develop分支, git merge --no-ff develop ; 且部署上线时对应production环境,不可混肴 +- develop: 平时开发使用此分支, 需另开分支并说明是做什么的, 比如fix bug, git checkout -b fix-xxxx, 开发完成自测无问题后合并到develop分支， +- test: 如不必要不在此分支做任何修改, 合并develpo分支, git merge --no-ff develop ; 部署上线时对应test环境,不可混肴 + ### git 提交规范 - feature 新增一个功能 - bugfix 修复一个 @@ -44,12 +60,13 @@ npm run build 。 ### 版本控制以及版本迭代说明 + ### v1.0.0 `2022.02.23` build - 初版发布 - 完成 项目搭建 -- 完成 项目迁移 从documentFrontEndWeb 到 AlipayFrontendWeb +- 完成 项目迁移 从documentFrontEndWeb 到 AntpayFrontEnd - 增加 docker部署脚本 - 增加 环境设置脚本 - 增加 nginx.conf文件 @@ -61,4 +78,12 @@ fix feature - 增加 非支付宝浏览环境下扫码切换支付宝弹窗提示 - 增加 android和ios设备支付宝下载链接 -- 增加 android设备复制粘贴下载链接功能 \ No newline at end of file +- 增加 android设备复制粘贴下载链接功能 + + +### v1.0.2 +`2022.03.04` +feature +- 增加 春雨个性化定制 '@/views/chunyu/AliPayForm' +- 增加 Checkbox 组件, '@/components/checkbox' +- 增加 AgreementDialog 组件, '@/components/AgreementDialog' \ No newline at end of file diff --git a/antpay_frontend_web_run.sh b/antpay_frontend_web_run.sh index cb60b1f..6ff264e 100644 --- a/antpay_frontend_web_run.sh +++ b/antpay_frontend_web_run.sh @@ -2,9 +2,9 @@ ### # @Date: 2021-11-15 09:37:49 # @LastEditors: JinxChen - # @LastEditTime: 2022-02-25 11:36:46 + # @LastEditTime: 2022-03-04 10:47:47 # @FilePath: \AntpayFrontEnd\antpay_frontend_web_run.sh - # @description: docker部署脚本 + # @description: docker部署脚本, 根据项目具体情况来 修改 docker run -p 8804:80 ### environment=$1 version=$2 diff --git a/package-lock.json b/package-lock.json index e7acc8a..50a360b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,8 +5,10 @@ "requires": true, "packages": { "": { + "name": "alipay-scan-code-front-end", "version": "0.1.0", "dependencies": { + "@vant/area-data": "^1.2.2", "axios": "^0.26.0", "core-js": "^3.6.5", "nprogress": "^0.2.0", @@ -2492,6 +2494,11 @@ "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==", "dev": true }, + "node_modules/@vant/area-data": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@vant/area-data/-/area-data-1.2.2.tgz", + "integrity": "sha512-efv7Yl/OTHjyy0irhJJPtgZb5mJZmroEtVOa8vkGRNTLY93+NgEcVuIBaC35hYCMsTrPHDQRvQGnI9Hyhtto0Q==" + }, "node_modules/@vant/icons": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.7.3.tgz", @@ -21439,6 +21446,11 @@ "integrity": "sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw==", "dev": true }, + "@vant/area-data": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@vant/area-data/-/area-data-1.2.2.tgz", + "integrity": "sha512-efv7Yl/OTHjyy0irhJJPtgZb5mJZmroEtVOa8vkGRNTLY93+NgEcVuIBaC35hYCMsTrPHDQRvQGnI9Hyhtto0Q==" + }, "@vant/icons": { "version": "1.7.3", "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.7.3.tgz", diff --git a/package.json b/package.json index 9600648..d5ffd6e 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "test:unit": "vue-cli-service test:unit" }, "dependencies": { + "@vant/area-data": "^1.2.2", "axios": "^0.26.0", "core-js": "^3.6.5", "nprogress": "^0.2.0", diff --git a/src/api/alipay.js b/src/api/alipay.js index d6a7ee4..0450017 100644 --- a/src/api/alipay.js +++ b/src/api/alipay.js @@ -1,9 +1,9 @@ /* * @Date: 2022-02-14 15:18:50 * @LastEditors: JinxChen - * @LastEditTime: 2022-02-14 15:21:05 - * @FilePath: \alipay-scan-code-front-end\src\api\goods.js - * @description: + * @LastEditTime: 2022-03-04 10:50:22 + * @FilePath: \AntpayFrontEnd\src\api\alipay.js + * @description: axios封装 */ import request from '../http/request'; diff --git a/src/components/AgreementDialog.vue b/src/components/AgreementDialog.vue new file mode 100644 index 0000000..a675c58 --- /dev/null +++ b/src/components/AgreementDialog.vue @@ -0,0 +1,144 @@ + + + + + + diff --git a/src/main.js b/src/main.js index b7c720c..2f14456 100644 --- a/src/main.js +++ b/src/main.js @@ -1,7 +1,7 @@ /* * @Date: 2022-01-19 10:08:26 * @LastEditors: JinxChen - * @LastEditTime: 2022-02-25 17:51:58 + * @LastEditTime: 2022-03-04 15:00:32 * @FilePath: \AntpayFrontEnd\src\main.js * @description: */ @@ -34,7 +34,11 @@ import { Notify, Loading, Toast, -} from 'vant'; + Popup, + Area, + Cascader, + Picker, +} from 'vant'; //按需加载vant组件 Vue .use(Button) @@ -59,9 +63,14 @@ Vue .use(Notify) .use(Loading) .use(Toast) + .use(Area) + .use(Popup) + .use(Picker) + .use(Cascader) .use(Tabs); Vue.config.productionTip = false; +Vue.prototype.$bus = new Vue(); new Vue({ router, store,