From 986f7be29b9492f1f752b34f92505c894a2f2d2b Mon Sep 17 00:00:00 2001 From: itgaojian163 Date: Thu, 15 May 2025 16:54:07 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=80=82=E9=85=8D,=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 348 +++++++++--- common/js/conver.js | 64 ++- common/js/data.js | 63 +++ common/js/net/UserApi.js | 168 +++--- common/js/net/http.js | 40 +- common/js/net/mainUrl.js | 18 + common/js/net/projectApi.js | 6 + common/js/util.js | 7 +- common/js/validator.js | 12 +- common/style/icons.css | 29 + main.js | 17 +- manifest.json | 2 +- pages.json | 172 +++--- pages/copyright/createBuy/createBuy.vue | 506 ++++++++--------- .../createProjectInfo/createProjectInfo.vue | 532 ++++++++++-------- pages/index/home.vue | 299 ++++++---- pages/login/login.vue | 3 +- .../mineAccount/mineContact/mineContact.vue | 14 +- .../mineAccount/mineCoupons/mineCoupons.vue | 19 +- pages/mine/mineAccount/mineInfo/mineInfo.vue | 15 +- .../mineMsgNotice/mineMsgNotice.vue | 334 +++++++++++ .../mine/mineAccount/mineOrder/mineOrder.vue | 9 +- pages/mine/mineIndex/mineIndex.vue | 134 ++++- pages/pay/payState/payState.vue | 2 +- pages/pay/payment/payment.vue | 6 +- pages/pay/publicPay/publicPay.vue | 106 ++-- uni.scss | 143 +++-- 27 files changed, 1994 insertions(+), 1074 deletions(-) create mode 100644 common/js/data.js create mode 100644 common/js/net/mainUrl.js create mode 100644 pages/mine/mineAccount/mineMsgNotice/mineMsgNotice.vue diff --git a/App.vue b/App.vue index 5f38d5f..013f46f 100644 --- a/App.vue +++ b/App.vue @@ -12,92 +12,57 @@ } - \ No newline at end of file diff --git a/common/js/conver.js b/common/js/conver.js index 2e17379..cf5d1c3 100644 --- a/common/js/conver.js +++ b/common/js/conver.js @@ -3,21 +3,38 @@ const isEmpty = function(obj) { if (typeof obj !== 'object') return false; return JSON.stringify(obj) === '{}'; }; -const status = function(value) { - var status = '排队中...' - switch (value) { - case 'NONE': - status = '排队中...' - break - case 'GENERATING': - status = '生成中...' - break - case 'SUCCESS': - status = '生成成功' - break - case 'FAILED': - status = '生成失败' - break +const status = function(value, state) { + var status = '未生成' + if (state == 'SUCCESS') { + switch (value) { + case 'NONE': + status = '未生成' + break + case 'PENDING': + status = '等待' + break + case 'GENERATING': + status = '生成中...' + break + case 'SUCCESS': + status = '生成成功' + break + case 'FAILED': + status = '生成失败' + break + } + } else { + switch (state) { + case 'FAILED': + status = '生成失败' + break + case 'GENERATING': + status = '生成中...' + break + case 'NONE': + status = '未生成' + break + } } return status }; @@ -108,6 +125,19 @@ const objIsEmpty = function(obj) { } return Object.keys(obj).length === 0; } +var moneyTxt = function(size, fontSize, price) { + const formattedStr = + '￥' + price + + ''; + return formattedStr +} +var phoneNum = function(str, startLength, endLength, replaceStr) { + if (str == null || str == '') return '' + if (str.length <= startLength + endLength) { + return str; + } + return str.slice(0, startLength) + replaceStr + str.slice(str.length - endLength); +} export { isEmpty, status, @@ -116,5 +146,7 @@ export { boderStyle, fontColor, timeSplit, - objIsEmpty + objIsEmpty, + moneyTxt, + phoneNum } \ No newline at end of file diff --git a/common/js/data.js b/common/js/data.js new file mode 100644 index 0000000..d264e15 --- /dev/null +++ b/common/js/data.js @@ -0,0 +1,63 @@ +const kindList = [{ + "value": "CODE", + "title": "代码" +}, { + "title": "操作手册", + "value": "MANUAL" +}, { + "title": "全部", + "value": "ALL" +}] +const typeList = [{ + "title": "一次补正", + "value": "CORRECTION1" +}, { + "title": "二次补正", + "value": "CORRECTION2" +}] +const stateList = [{ + "title": "待审核", + "value": "PENDING" +}, { + "title": "已通过", + "value": "APPROVED" +}, { + "title": "未通过", + "value": "REJECTED" +}, { + "title": "已取消", + "value": "CANCELED" +}] +const homeTypeList = [{ + value: 'FREE', + label: '免费试用' + }, + { + value: 'MATERIAL', + label: '写材料' + }, + { + value: 'ALL', + label: '全托管' + } +] +const expandList = [{ + value: 'PKG', + label: '安装包' + }, + { + value: 'VIDEO_DEMO', + label: '演示视频' + }, + { + value: 'URGENT', + label: '加急' + } +] +export { + stateList, + kindList, + typeList, + homeTypeList, + expandList +} \ No newline at end of file diff --git a/common/js/net/UserApi.js b/common/js/net/UserApi.js index 4d30dac..bb0e06d 100644 --- a/common/js/net/UserApi.js +++ b/common/js/net/UserApi.js @@ -3,80 +3,104 @@ import { } from "./http.js"; // 公共API const apiPath = { - loginUrl: '/api/user/wx/login', //登录 - registerUrl: '/api/user/wx/register', //注册, - updateUserInfo: '/api/user-info/update-self', - csaNo: '/api/csa/get', //获取客服编号 - createContact: '/api/proj-contact/save', //创建联系人 - mineAccount: '/api/user-info/get-user-self', //获取我的账户余额 - minePackageCount: '/api/proj/servicepkg/packageorder/count/self', //我的套餐包剩余 - uploadImg: '/api/file/v2/upload-image', //上传图片 - userInfo: '/api/user-info/get-self', //获取我的个人信息 - mineOrder: '/api/order/listpage/self', //我的订单 - mineContact: '/api/proj-contact/listpage/self', //联系人列表 - updateContact: '/api/proj-contact/update/{projContactId}', //更新联系人 - delContact: '/api/proj-contact/remove/{ids}', //删除联系人 - canClaimsCoupons: '/api/coupon/list-can-claim', //获取可以申领的优惠卷 - saveCoupons: '/api/coupon/user/save', //领取优惠卷 +loginUrl: '/api/user-wx/login', //登录 + registerUrl: '/api/user-wx/register', //注册, + unbindWx: '/api/user-wx/unlock-phone', //解绑微信 + updateUserInfo: '/api/user-info/update-self', + csaNo: '/api/csa/get', //获取客服编号 + createContact: '/api/proj-contact/save', //创建联系人 + mineAccount: '/api/user-info/get-user-self', //获取我的账户余额 + minePackageCount: '/api/proj/servicepkg/packageorder/count/self', //我的套餐包剩余 + uploadImg: '/api/file/v2/upload-image', //上传图片 + userInfo: '/api/user-info/get-self', //获取我的个人信息 + mineOrder: '/api/order/listpage/self', //我的订单 + mineContact: '/api/proj-contact/listpage/self', //联系人列表 + updateContact: '/api/proj-contact/update/{projContactId}', //更新联系人 + delContact: '/api/proj-contact/remove/{ids}', //删除联系人 + canClaimsCoupons: '/api/coupon/list-can-claim', //获取可以申领的优惠卷 + saveCoupons: '/api/coupon/user/save', //领取优惠卷 + minePayRecord: '/api/account/listpage-item/self', + mineMsgNotice: '/api/user-msg/listpage-simple/self', //获取消息通知 + readMsgNotice: '/api/user-msg/update-read/self', //标记读取消息 + deleteMsgNotice: '/api/user-msg/remove/self/{ids}', //删除消息通知 } class UserApi { - static doLogin(data) { - return request(apiPath.loginUrl, "POST", data, null, 'operator', false) - } - static doRegister(data) { - return request(apiPath.registerUrl, "POST", data, null, 'operator', false) - } - static doUpdateUserInfo(data) { - return request(apiPath.updateUserInfo, "PUT", data) - } - static doGetCsaNo() { - return request(apiPath.csaNo, "GET") - } - static doCreateContact(data) { - return request(apiPath.createContact, "POST", data) - } - //获取我的账户余额 - static doGetMineAccount() { - return request(apiPath.mineAccount, "GET") - } - //获取我的套餐包 - static doGetMinePackageCount() { - return request(apiPath.minePackageCount, "GET") - } - //上传图片 - static doUploadImg(data) { - return request(apiPath.uploadImg, "POST", data) - } - //获取个人信息 - static doGetUserInfo() { - return request(apiPath.userInfo, "GET") - } - //获取我的订单 - static doGetMineOrder(data) { - return request(apiPath.mineOrder, "GET", data) - } - //获取项目联系人列表 - static doGetMineContactList(data) { - return request(apiPath.mineContact, "GET", data) - } - //更新联系人 - static doUpdateContactList(id, data) { - const path = apiPath.updateContact.replace('{projContactId}', id) - return request(path, "PUT", data) - } - //删除联系人 - static doDelContact(id) { - const path = apiPath.delContact.replace('{ids}', id) - return request(path, "DELETE") - } - //获取可以申领的优惠卷 - static doGetClaimsCouponsList() { - return request(apiPath.canClaimsCoupons, "GET") - } - //领取优惠卷 - static doSaveCoupons(data) { - return request(apiPath.saveCoupons, "POST", data) - } + static doLogin(data) { + return request(apiPath.loginUrl, "POST", data, null, 'operator', false) + } + static doRegister(data) { + return request(apiPath.registerUrl, "POST", data, null, 'operator', false) + } + static doUnbindWx() { + return request(apiPath.unbindWx, "GET", null, null, 'operator', true) + } + static doUpdateUserInfo(data) { + return request(apiPath.updateUserInfo, "PUT", data) + } + static doGetCsaNo() { + return request(apiPath.csaNo, "GET") + } + static doCreateContact(data) { + return request(apiPath.createContact, "POST", data) + } + static doGetMinePayRecord(data) { + return request(apiPath.minePayRecord, 'GET', data) + } + //获取我的账户余额 + static doGetMineAccount() { + return request(apiPath.mineAccount, "GET") + } + //获取我的套餐包 + static doGetMinePackageCount() { + return request(apiPath.minePackageCount, "GET") + } + //上传图片 + static doUploadImg(data) { + return request(apiPath.uploadImg, "POST", data) + } + //获取个人信息 + static doGetUserInfo() { + return request(apiPath.userInfo, "GET") + } + //获取我的订单 + static doGetMineOrder(data) { + return request(apiPath.mineOrder, "GET", data) + } + //获取项目联系人列表 + static doGetMineContactList(data) { + return request(apiPath.mineContact, "GET", data) + } + //更新联系人 + static doUpdateContactList(id, data) { + const path = apiPath.updateContact.replace('{projContactId}', id) + return request(path, "PUT", data) + } + //删除联系人 + static doDelContact(id) { + const path = apiPath.delContact.replace('{ids}', id) + return request(path, "DELETE") + } + //获取可以申领的优惠卷 + static doGetClaimsCouponsList() { + return request(apiPath.canClaimsCoupons, "GET") + } + //领取优惠卷 + static doSaveCoupons(data) { + return request(apiPath.saveCoupons, "POST", data) + } + //获取消息通知 + static doGetMineMsgNotice(data) { + return request(apiPath.mineMsgNotice, "GET", data) + } + //标记读取状态 + static doReadMineMsgNotice(data) { + return request(apiPath.readMsgNotice, 'PUT', data) + } + //删除消息通知 + static doDeleteMineMsgNotice(id) { + const path = apiPath.deleteMsgNotice.replace('{ids}', id) + return request(path, 'DELETE') + } } export default UserApi; \ No newline at end of file diff --git a/common/js/net/http.js b/common/js/net/http.js index 4e5e046..da8c019 100644 --- a/common/js/net/http.js +++ b/common/js/net/http.js @@ -2,13 +2,16 @@ import { set, get } from '../cache/storage.js'; -// 定义api服务地址 -// const baseUrl = 'https://www.xzszwhy.cn/daqi/app'; -const operatorUrl = 'http://192.168.0.15:8091/operator'; -// const operatorUrl = 'https://www.aimzhu.com/operator'; -const copyrightUrl = 'http://192.168.0.15:7025/copyright'; -const uploadImgUrl = copyrightUrl + '/api/file/v2/upload-image' -const previewUrl = copyrightUrl + '/route/file/v2/download/true/' +import { + operatorUrl, + operatorPlug, + uploadImgUrl, + previewUrl, + copyrightUrl, + imgAssets, + appUrl +} from '../net/mainUrl' + /** * 传入请求参数，返回Promise支持链试调用 * @param url 请求地址 @@ -18,13 +21,12 @@ const previewUrl = copyrightUrl + '/route/file/v2/download/true/' */ function request(url, method = "GET", data = {}, params = {}, project = "copyright", needToken = true) { const header = { - "Content-Type": "application/json" + "content-type": "application/json" + // 有其他content-type需求加点逻辑判断处理即可 } //是否需要token if (needToken) { - //TODO const token = get('token') - const token = - 'NjBIOFRORDcraDc4U1RsUTI4a3B5em50VVVzclp2QjdFWDV2dVJJc0VLL3Fhazd0bjZPaU9Tc3E1cHc2cmYyZTc0Y2FITTdRR0pMTk1xaVRHM0I1d0NiTnJ4b1BVSVNtUFl4SlFtR1g2M0tCQTc2TXM4L3d4ZVhwM09VREN0bDMrTXNoa0trWDR1eG5PdG84OXZ4UVE0dDhRUDdQRk1Qd2N0ZWVLSzJaZzBjcC82NXdueGQvUkZNSm1vZ2doQmFncnRQN0pFQ240enZHaEdFcGpVTDZqY3VpdHRUZERUS2Y5RG5BdXZmeE1kNVVyM29icTZTV054RzNYdURDa2lvR3dIbi9nNmJLOHduNUl4Snp3Qm1qTDRkYXFXZ2plaGNQRmw3ZXBZTlgxV3cwZkVuaGxHZlhRb0ZZMlEveEJhQS9zeWE5NnpxRlUxTmJWYkRmMitvMTZXRnExVytHNEhEb1JPZkE4TG5UVzc0PQ==' + const token = get('token') if (token) { header.Auth = `Bearer ${token}`; } @@ -35,17 +37,17 @@ function request(url, method = "GET", data = {}, params = {}, project = "copyrig baseUrl = operatorUrl } else if (project == 'copyright') { baseUrl = copyrightUrl - } else if (project == 'online') { - baseUrl = 'https://www.aimzhu.com/operator' + } else if (project == 'plug') { + baseUrl = operatorPlug } return new Promise(function(resolve, reject) { uni.request({ url: baseUrl + url, timeout: 8000, - method: method, - data: data, - dataType: 'json', - header: header, + method, + data, + dataType: "json", // 微信官方文档中介绍会对数据进行一次JSON.parse + header, success(res) { if (res.statusCode === 200) { resolve(res.data) @@ -71,5 +73,7 @@ export { request, uploadImgUrl, previewUrl, - copyrightUrl + copyrightUrl, + imgAssets, + appUrl } \ No newline at end of file diff --git a/common/js/net/mainUrl.js b/common/js/net/mainUrl.js new file mode 100644 index 0000000..4d84999 --- /dev/null +++ b/common/js/net/mainUrl.js @@ -0,0 +1,18 @@ +// 定义api服务地址 +const operatorUrl = 'https://www.aimzhu.com/operator'; +const operatorPlug = 'https://www.aimzhu.com/operator-plugin' +const copyrightUrl = 'https://www.aimzhu.com/copyright'; +const uploadImgUrl = copyrightUrl + '/api/file/v2/upload-image' +const previewUrl = copyrightUrl + '/route/file/v2/download/true/' +const imgAssets = 'https://www.aimzhu.com/miniapp-assets' +const appUrl = 'https://www.aimzhu.com' + +export { + operatorUrl, + operatorPlug, + uploadImgUrl, + previewUrl, + copyrightUrl, + imgAssets, + appUrl +} \ No newline at end of file diff --git a/common/js/net/projectApi.js b/common/js/net/projectApi.js index d9ea63d..2c433e9 100644 --- a/common/js/net/projectApi.js +++ b/common/js/net/projectApi.js @@ -12,6 +12,7 @@ const apiPath = { getPackageList: '/api/proj/servicepkg/packageorder/listpage/self', //获取套餐包 getCommendProjectName: '/api/proj/recommend/list-proj-name/ai', //推荐项目名称 createProject: '/api/proj/create-quick', //快速创建项目 + buildProject: '/api/proj/create-quick/proj-id/{projId}', //生成项目 reCreate: '/api/proj/generate/proj-id/${projId}', //重新生成 proLangList: '/api/env/custom/list-active-lang', //项目语言 ruleData: '/app/agreementportal/getrelease/{id}', //使用规则 project="operator" @@ -53,6 +54,11 @@ class ProApi { static doCreateProject(data) { return request(apiPath.createProject, "POST", data) } + //生成项目 + static doBuildProject(id) { + const path = apiPath.buildProject.replace('{projId}', id) + return request(path, "GET") + } //重新生成 static doReCreate(url) { const path = apiPath.reCreate.replace('${projId}', url) diff --git a/common/js/util.js b/common/js/util.js index a485ba1..29d1ac2 100644 --- a/common/js/util.js +++ b/common/js/util.js @@ -67,6 +67,10 @@ const pxToRpx = (pxValue, screenWidth) => { // return pxValue * (750 / screenWidth); const rpx = (750 / screenWidth) * Number(pxValue) return Math.floor(rpx); +} + +const rpxToPx = (rpxValue, screenWidth) => { + return rpxValue * screenWidth / 750; } @@ -201,5 +205,6 @@ export { removeImgStyleFromRichText, dateTimePicker, pxToRpx, - random32Str + random32Str, + rpxToPx } \ No newline at end of file diff --git a/common/js/validator.js b/common/js/validator.js index 200a525..fc466ce 100644 --- a/common/js/validator.js +++ b/common/js/validator.js @@ -1,6 +1,16 @@ // 手机号验证 const isValidPhone = (phone) => { - return /^1[3-9]\d{9}$/.test(phone); + // 手机号码正则 + const mobilePattern = /^1[3-9]\d{9}$/; + // 固定电话正则 + const landlinePattern = /^(0\d{2,3})[- ]?\d{7,8}$/; + if (mobilePattern.test(phone)) { + return true + } else if (landlinePattern.test(phone)) { + return true + } else { + return false + } }; // 邮箱验证 diff --git a/common/style/icons.css b/common/style/icons.css index c091aba..0c0a038 100644 --- a/common/style/icons.css +++ b/common/style/icons.css @@ -90,4 +90,33 @@ background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ0ODc0NTc3NTYwIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjQ0MzYiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTU3Mi4xNiA1MTJsMTgzLjQ2NjY2Ny0xODMuMDRhNDIuNjY2NjY3IDQyLjY2NjY2NyAwIDEgMC02MC41ODY2NjctNjAuNTg2NjY3TDUxMiA0NTEuODRsLTE4My4wNC0xODMuNDY2NjY3YTQyLjY2NjY2NyA0Mi42NjY2NjcgMCAwIDAtNjAuNTg2NjY3IDYwLjU4NjY2N2wxODMuNDY2NjY3IDE4My4wNC0xODMuNDY2NjY3IDE4My4wNGE0Mi42NjY2NjcgNDIuNjY2NjY3IDAgMCAwIDAgNjAuNTg2NjY3IDQyLjY2NjY2NyA0Mi42NjY2NjcgMCAwIDAgNjAuNTg2NjY3IDBsMTgzLjA0LTE4My40NjY2NjcgMTgzLjA0IDE4My40NjY2NjdhNDIuNjY2NjY3IDQyLjY2NjY2NyAwIDAgMCA2MC41ODY2NjcgMCA0Mi42NjY2NjcgNDIuNjY2NjY3IDAgMCAwIDAtNjAuNTg2NjY3eiIgcC1pZD0iNDQzNyIgZmlsbD0iIzhhOGE4YSI+PC9wYXRoPjwvc3ZnPg=='); background-size: contain; background-repeat: no-repeat; + z-index: 2; +} + +.icon-arrow-solid::after { + content: ''; + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ1ODA2NDUxMTAzIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE0MDQ5IiB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Ik0xMDA0Ljk5MTg5NCAyNDIuOTkzNDRjLTEyLjY1ODA2MS0xMi42Njg1NjgtMjcuNjYyODAyLTE4Ljk5NzU5OS00NS4wMDAyMTItMTguOTk3NTk5SDY0LjAwNDgxNmMtMTcuMzQ0NDE1IDAtMzIuMzM4NjQ5IDYuMzI5MDMtNDUuMDA3MjE3IDE4Ljk5NzU5OUM2LjMyOTAzIDI1NS42NzYwMTggMCAyNzAuNjcwMjUxIDAgMjg4LjAwNDE1OWMwIDE3LjMzMDQwNSA2LjMyOTAzIDMyLjMyNDYzOSAxOC45OTc1OTkgNDQuOTk2NzFsNDQ3Ljk5NTE4NCA0NDcuOTk1MTg0YzEyLjY4MjU3OCAxMi42Njg1NjggMjcuNjc2ODEyIDE5LjAxMTYwOSA0NS4wMDcyMTcgMTkuMDExNjA5czMyLjMzODY0OS02LjM0MzA0IDQ0Ljk5NjcxLTE5LjAxMTYwOUwxMDA0Ljk5MTg5NCAzMzIuOTk3MzY2YzEyLjY1NDU1OC0xMi42Njg1NjggMTkuMDA4MTA2LTI3LjY2MjgwMiAxOS4wMDgxMDYtNDQuOTk2NzA5IDAtMTcuMzMwNDA1LTYuMzUzNTQ4LTMyLjMyNDYzOS0xOS4wMDgxMDYtNDUuMDA3MjE3eiIgcC1pZD0iMTQwNTAiIGZpbGw9IiNkYmRiZGIiPjwvcGF0aD48L3N2Zz4='); + display: block; + background-size: cover; + width: 20rpx; + height: 20rpx; + margin-left: 10rpx; +} + +.icon-user-default-blue { + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQzOTg4MzkwNjkwIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjM0MDkiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTUxMiAxMDI0QzIyOS4yMDUzMzMgMTAyNCAwIDc5NC43OTQ2NjcgMCA1MTJTMjI5LjIwNTMzMyAwIDUxMiAwczUxMiAyMjkuMjA1MzMzIDUxMiA1MTItMjI5LjIwNTMzMyA1MTItNTEyIDUxMnogbTAtNDk2LjQ2OTMzM2ExNzAuNjY2NjY3IDE3MC42NjY2NjcgMCAxIDAgMC0zNDEuMzMzMzM0IDE3MC42NjY2NjcgMTcwLjY2NjY2NyAwIDAgMCAwIDM0MS4zMzMzMzR6IG0yNjMuNzY1MzMzIDI2My43MjI2NjZhMjYzLjc2NTMzMyAyNjMuNzY1MzMzIDAgMSAwLTUyNy41MzA2NjYgMGg1MjcuNTMwNjY2eiIgcC1pZD0iMzQxMCIgZmlsbD0iIzEyOTZkYiI+PC9wYXRoPjwvc3ZnPg=='); + background-size: cover; + background-repeat: no-repeat; +} + +.icon-add-circle-blue { + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ3MDM1NjY4ODU4IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjE2NDIiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTUxMiA5MzYuOTE1NjE5Yy0yMzQuNjcyNzY0IDAtNDI0LjkxNTYxOS0xOTAuMjQzODc5LTQyNC45MTU2MTktNDI0LjkxNTYxOVMyNzcuMzI3MjM2IDg3LjA4MzM1NyA1MTIgODcuMDgzMzU3YzIzNC42NzY4NTcgMCA0MjQuOTE2NjQzIDE5MC4yNDM4NzkgNDI0LjkxNjY0MyA0MjQuOTE1NjE5Uzc0Ni42NzY4NTcgOTM2LjkxNTYxOSA1MTIgOTM2LjkxNTYxOXpNNzI0LjQ1NzgxIDQ2OS41MDQxNCA1NTQuNDkxNzY3IDQ2OS41MDQxNCA1NTQuNDkxNzY3IDI5OS41NDYyODRsLTg0Ljk4MzUzMyAwIDAgMTY5Ljk1Nzg1N0wyOTkuNTQyMTkgNDY5LjUwNDE0bDAgODQuOTkxNzIgMTY5Ljk2NjA0MyAwIDAgMTY5Ljk2NjA0MyA4NC45ODM1MzMgMEw1NTQuNDkxNzY3IDU1NC40OTU4NmwxNjkuOTY2MDQzIDBMNzI0LjQ1NzgxIDQ2OS41MDQxNHoiIHAtaWQ9IjE2NDMiIGZpbGw9IiMzMjcwRkYiPjwvcGF0aD48L3N2Zz4='); + background-size: cover; + background-repeat: no-repeat; +} + +.icon-del-red { + background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ3Mjk4NjU3MTUxIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI2MjEiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTc2NS41MDU2OTEgMTkxLjk0MjU2NyA2MzkuNjI3NzcyIDE5MS45NDI1NjdjMC0zNS4zMjQ1My0yOC42MzYyMDEtNjMuOTYwNzMxLTYzLjk2MDczMS02My45NjA3MzFMNDQ3Ljc0NTU4IDEyNy45ODE4MzZjLTM1LjMyNDUzIDAtNjMuOTYwNzMxIDI4LjYzNjIwMS02My45NjA3MzEgNjMuOTYwNzMxTDI1Ny45MDU5MDggMTkxLjk0MjU2N2MtMzYuNDUyMjEzIDAtNjYuMDAzMjUgMjkuNTUxMDM2LTY2LjAwMzI1IDY2LjAwMzI1bDAgNTkuODc1NjkyYzAgMzYuNDUyMjEzIDI5LjU1MTAzNiA2Ni4wMDMyNSA2Ni4wMDMyNSA2Ni4wMDMyNWwtMi4wNDI1MTkgMCAwIDQ0NS42ODE1NzJjMCAzNi40NTIyMTMgMjkuNTUxMDM2IDY2LjAwMzI1IDY2LjAwMzI1IDY2LjAwMzI1bDYxLjkxODIxMSAwIDYzLjk2MDczMSAwIDEyNy45MjE0NjEgMCA2My45NjA3MzEgMCA2MS45MTgyMTEgMGMzNi40NTIyMTMgMCA2Ni4wMDMyNS0yOS41NTEwMzYgNjYuMDAzMjUtNjYuMDAzMjVMNzY3LjU0OTIzNCAzODMuODIzNzM2bC0yLjA0MjUxOSAwYzM2LjQ1MjIxMyAwIDY2LjAwMzI1LTI5LjU1MTAzNiA2Ni4wMDMyNS02Ni4wMDMyNWwwLTU5Ljg3NTY5MkM4MzEuNTA4OTQxIDIyMS40OTI1OCA4MDEuOTU4OTI4IDE5MS45NDI1NjcgNzY1LjUwNTY5MSAxOTEuOTQyNTY3ek03MDMuNTg3NDggODAzLjQxMzA0NmMtMC4xMDEzMDcgMy4xMjMxMzEtMS43NDM3MTQgMjcuODEzNDYyLTI3Ljk2MTg0MiAyOC4xMzQ3ODFsLTM1Ljk5ODg4OSAwLTYzLjk2MDczMSAwTDQ0Ny43NDU1OCA4MzEuNTQ3ODI3IDM4My43ODQ4NSA4MzEuNTQ3ODI3bC0zNS44NzkxNjIgMGMtMjcuOTg4NDQ4LTAuMzQzODMxLTI3Ljk2OTAwNS0yOC40NTkxNjktMjcuOTY5MDA1LTI4LjQ1OTE2OWwtMC4xMTI1NjQgMC4wMzE3MjJMMzE5LjgyNDExOSAzODMuODIzNzM2bDM4My43NjMzNiAwTDcwMy41ODc0OCA4MDMuNDEzMDQ2ek03MzUuNTY3ODQ1IDMxOS44NjMwMDUgMjg3Ljg0Mzc1NCAzMTkuODYzMDA1Yy0xNy42NjIyNjUgMC0zMS45ODAzNjUtMTQuMzE4MS0zMS45ODAzNjUtMzEuOTgwMzY1IDAtMTcuNjYyMjY1IDE0LjMxODEtMzEuOTgwMzY1IDMxLjk4MDM2NS0zMS45ODAzNjVsMTU5LjkwMTgyNyAwIDEyNy45MjE0NjEgMCAxNTkuOTAxODI3IDBjMTcuNjYyMjY1IDAgMzEuOTgwMzY1IDE0LjMxODEgMzEuOTgwMzY1IDMxLjk4MDM2NUM3NjcuNTQ4MjEgMzA1LjU0NDkwNSA3NTMuMjMwMTEgMzE5Ljg2MzAwNSA3MzUuNTY3ODQ1IDMxOS44NjMwMDV6IiBwLWlkPSIyNjIyIiBmaWxsPSIjZTQ3YzZlIj48L3BhdGg+PHBhdGggZD0iTTQ0Ny43NDU1OCA3NjcuNTg4MTE5YzE3LjY2MjI2NSAwIDMxLjk4MDM2NS0xNC4zMTgxIDMxLjk4MDM2NS0zMS45ODAzNjVMNDc5LjcyNTk0NiA0NzkuNzY0ODMxYzAtMTcuNjYyMjY1LTE0LjMxODEtMzEuOTgwMzY1LTMxLjk4MDM2NS0zMS45ODAzNjUtMTcuNjYyMjY1IDAtMzEuOTgwMzY1IDE0LjMxODEtMzEuOTgwMzY1IDMxLjk4MDM2NWwwIDI1NS44NDI5MjJDNDE1Ljc2NTIxNSA3NTMuMjcwMDE5IDQzMC4wODMzMTYgNzY3LjU4ODExOSA0NDcuNzQ1NTggNzY3LjU4ODExOXoiIHAtaWQ9IjI2MjMiIGZpbGw9IiNlNDdjNmUiPjwvcGF0aD48cGF0aCBkPSJNNTc1LjY2NzA0MiA3NjcuNTg4MTE5YzE3LjY2MjI2NSAwIDMxLjk4MDM2NS0xNC4zMTgxIDMxLjk4MDM2NS0zMS45ODAzNjVMNjA3LjY0NzQwNyA0NzkuNzY0ODMxYzAtMTcuNjYyMjY1LTE0LjMxODEtMzEuOTgwMzY1LTMxLjk4MDM2NS0zMS45ODAzNjUtMTcuNjYyMjY1IDAtMzEuOTgwMzY1IDE0LjMxODEtMzEuOTgwMzY1IDMxLjk4MDM2NWwwIDI1NS44NDI5MjJDNTQzLjY4NjY3NiA3NTMuMjcwMDE5IDU1OC4wMDQ3NzcgNzY3LjU4ODExOSA1NzUuNjY3MDQyIDc2Ny41ODgxMTl6IiBwLWlkPSIyNjI0IiBmaWxsPSIjZTQ3YzZlIj48L3BhdGg+PC9zdmc+'); + background-size: cover; + background-repeat: no-repeat; } \ No newline at end of file diff --git a/main.js b/main.js index 4d7694a..19f5add 100644 --- a/main.js +++ b/main.js @@ -1,5 +1,8 @@ import App from './App' - +import { + imgAssets, + appUrl +} from './common/js/net/mainUrl' // #ifndef VUE3 import Vue from 'vue' import './uni.promisify.adaptor' @@ -17,6 +20,18 @@ import { } from 'vue' export function createApp() { const app = createSSRApp(App) + // app.provide('globalData', { + // appTitle: '测试' + // }) + app.provide('globalData', { + imgAssetsUrl: imgAssets, + locImg: "/static/images", + slideBtns: [], + appTitle: 'AI喵著', + appUrl: appUrl, + onlyDelBtns: [], + cancelEditBtns: [] + }) return { app } diff --git a/manifest.json b/manifest.json index 64da853..9309dae 100644 --- a/manifest.json +++ b/manifest.json @@ -61,7 +61,7 @@ }, "mp-baidu" : { "usingComponents" : true, - "appid" : "testid" + "appid" : "118838711" }, "mp-toutiao" : { "usingComponents" : true, diff --git a/pages.json b/pages.json index 837e23f..e7425e9 100644 --- a/pages.json +++ b/pages.json @@ -8,98 +8,98 @@ { "path": "pages/index/home", "style": { - "navigationStyle": "custom" + "navigationStyle": "custom", + "enablePullDownRefresh": true } }, { "path": "pages/mine/mineIndex/mineIndex", "style": { - "navigationStyle": "custom" + "navigationStyle": "custom", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/common/readTxt/readTxt", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/mine/mineAccount/mineInfo/mineInfo", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/mine/mineAccount/mineOrder/mineOrder", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/mine/mineAccount/mineContact/mineContact", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/mine/mineAccount/mineCoupons/mineCoupons", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": true + } + }, + { + "path": "pages/pay/payment/payment", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/pay/publicPay/publicPay", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/pay/payState/payState", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/copyright/createBuy/createBuy", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/copyright/createProjectInfo/createProjectInfo", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/common/rule/rule", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "components/ad-popup", + "style": { + "navigationBarTitleText": "" + } + }, + { + "path": "pages/mine/mineAccount/mineMsgNotice/mineMsgNotice", + "style": { + "navigationBarTitleText": "", + "enablePullDownRefresh": true } - }, - { - "path" : "pages/common/readTxt/readTxt", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/mine/mineAccount/mineInfo/mineInfo", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/mine/mineAccount/mineOrder/mineOrder", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/mine/mineAccount/mineContact/mineContact", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/mine/mineAccount/mineCoupons/mineCoupons", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/pay/payment/payment", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/pay/publicPay/publicPay", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/pay/payState/payState", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/copyright/createBuy/createBuy", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/copyright/createProjectInfo/createProjectInfo", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "pages/common/rule/rule", - "style" : - { - "navigationBarTitleText" : "" - } - }, - { - "path" : "components/ad-popup", - "style" : - { - "navigationBarTitleText" : "" - } } ], "globalStyle": { diff --git a/pages/copyright/createBuy/createBuy.vue b/pages/copyright/createBuy/createBuy.vue index 8cecaac..240232e 100644 --- a/pages/copyright/createBuy/createBuy.vue +++ b/pages/copyright/createBuy/createBuy.vue @@ -1,154 +1,144 @@