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 @@
-
+
-
+
-
+
-
-
-
-
-
- 全托管
- ¥{{allPrice/100}}-{{(allPrice+urgent)/100}}
-
- 购买
-
-
- 从下单到取证,仅需提供基本信息,我们为您提供一站式管家服务.
- 提供的服务
-
-
-
- 包可运行软件开发与搭建
-
-
-
- 包鉴别材料撰写
-
-
-
-
-
- 包代办,包下证,包开发票提
-
-
-
- 供可运行软件安装包
-
-
-
-
-
- 提供可运行软件云服务900天
-
-
-
- 提供可运行软件演示视频
-
-
-
-
-
- 客服一对一服务
-
-
-
- 使用流程
-
-
- 填写系统名称
-
-
- 填写基本信息
-
-
- 接收证书
-
-
-
-
+
+
+
+ 全托管
+
+
+ 购买
+
+ 从下单到取证,仅需提供基本信息,我们为您提供一站式管家服务.
+ 提供的服务
+
+
+
+
+ 包可运行软件开发与搭建
+
+
+
+
+ 包鉴别材料撰写
+
+
+
+
+
+ 包代办,包下证,包开发票提
+
+
+
+ 供可运行软件安装包
+
+
+
+
+
+ 提供可运行软件云服务900天
+
+
+
+ 提供可运行软件演示视频
+
+
+
+
+
+ 客服一对一服务
+
+
+ 使用流程
+
+
+ 填写系统名称
+
+
+ 填写基本信息
+
+
+ 接收证书
-
-
-
-
-
- 写材料
- ¥{{materialPrice/100}}
-
- 购买
+
+
+
+ 写材料
+
-
- 通过平台自己搭建可运行软件后由平台自动生成相关鉴别材料,下载鉴别材料后可自行申报或找相关代理机构申报.
- 提供的服务
-
-
-
- 通过平台自己搭建可运行软件
-
-
-
- 平台自动撰写鉴别材料
-
-
-
-
-
- 包补正材料撰写一直到下证
-
-
-
- 两次补正不通过平台退款
-
-
-
-
-
- 包开发票
-
-
-
- 提供可运行软件云服务300天
-
-
-
-
-
- 客服一对一服务
-
-
-
- 使用流程
-
-
-
- 按系统操作流程执行
-
-
-
- 如需视频文件和安装包请在下证后购买下载
-
-
-
+ 购买
+
+ 通过平台自己搭建可运行软件后由平台自动生成相关鉴别材料,下载鉴别材料后可自行申报或找相关代理机构申报.
+ 提供的服务
+
+
+
+
+ 通过平台自己搭建可运行软件
+
+
+
+
+ 平台自动撰写鉴别材料
+
+
+
+
+
+ 包补正材料撰写一直到下证
+
+
+
+ 两次补正不通过平台退款
+
+
+
+
+
+ 包开发票
+
+
+
+ 提供可运行软件云服务300天
+
+
+
+
+
+ 客服一对一服务
+
+
+ 使用流程
+
+
+
+ 按系统操作流程执行
+
+
+
+ 如需视频文件和安装包请在下证后购买下载
-
-
-
-
- 免费试用请使用电脑端登录
- https://www.aimzhu.com
+
+
+
+ 免费试用请使用电脑端登录
+ {{globalData.appUrl}}
+
@@ -157,7 +147,20 @@
-
\ No newline at end of file
diff --git a/pages/copyright/createProjectInfo/createProjectInfo.vue b/pages/copyright/createProjectInfo/createProjectInfo.vue
index 0634851..4a13d2a 100644
--- a/pages/copyright/createProjectInfo/createProjectInfo.vue
+++ b/pages/copyright/createProjectInfo/createProjectInfo.vue
@@ -1,56 +1,62 @@
-
+
-
+
-
+
- 项目信息
+
推荐
-
-
- 产权联系人
+ 基本信息
+
+ 产权联系人
+
-
-
- {{selectContact.name}}
+
+
+
+ {{selectContact.name}}
+ {{phoneNum(selectContact.phone,3,4,'****')}}
-
+
- 新建
-
-
-
- 系统版本
-
-
-
- 系统语言
-
-
- {{selectLang}}
-
-
-
+
+
+ 新建
-
- 开发完成时间
+
+
+ 系统版本
+
+
+
+ 系统语言
+
+
+ {{selectLang}}
+
+
+
+
+
+ 开发完成时间
+
@@ -67,46 +73,50 @@
-
-
-
-
- 套餐包
-
+
+ 套餐与优惠
+
+ 套餐包
+
+ {{selectPackage.packageName?selectPackage.packageName:'请选择套餐包'}}
+
取消
-
- 优惠券
- {{selectCoupons.couponId? selectCoupons.coupon.title : '请选择优惠券'}}
+
+
+ 优惠券
+
+ {{selectCoupons.couponId? selectCoupons.coupon.title : '请选择优惠券'}}
+
取消
- 选择
-
+
-
-
-
- 项目名称
+
+
+
+ 项目名称
@@ -118,138 +128,146 @@
- 生成
+ 生成
-
-
-
- 新建联系人
+
+
+
+ 新建联系人
- 姓名
+ 姓 名
- 联系电话
+ 联系电话
- 联系邮箱
+ 联系邮箱
- 公司
+ 公 司
- 生成
+ 保存
-
-
-
- 系统语言
+
+
+
+ 系统语言
-
-
-
- {{item}}
-
-
-
+
+
+
+
+ {{item}}
+
+
+
+
- 确定
+ 确定
-
-
-
- 套餐包
+
+
+
+ 套餐包
-
-
-
-
-
-
-
- 套餐包
- 剩余{{item.packageTotalSurplusCount}}件
+
+
+
+
+
+
+
+
+ 套餐包
+ 剩余{{item.packageTotalSurplusCount}}件
+
+ {{item.packageInfoAppDTO.packageName}}
+
+ {{item.packageInfoAppDTO.packageDescription}}
+
- {{item.packageInfoAppDTO.packageName}}
- {{item.packageInfoAppDTO.packageDescription}}
+
+
+
-
-
-
-
-
-
-
-
-
- 确定
+
+
+
+
+
+ 确定
-
-
-
- 优惠卷
+
+
+
+ 优惠卷
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+ 优惠卷
- 优惠卷
+ 减{{item.coupon.amount/100}}元
- 减{{item.coupon.amount/100}}元
+ {{item.coupon.title}}
+
+ 有效期:{{item.coupon.useGmtStart}}至{{item.coupon.useGmtEnd}}
+
+
+
+
- {{item.coupon.title}}
-
- 有效期:{{item.coupon.useGmtStart}}至{{item.coupon.useGmtEnd}}
-
-
-
-
-
-
-
-
-
- 确定
+
+
+
+
+
+ 确定
@@ -267,10 +285,23 @@
} from '@/common/js/util.js'
import {
isEmpty,
- objIsEmpty
+ objIsEmpty,
+ phoneNum
} from '@/common/js/conver.js'
-
+ import {
+ isValidPhone,
+ isValidEmail
+ } from '@/common/js/validator.js'
+ import {
+ inject
+ } from 'vue'
export default {
+ setup() {
+ const globalData = inject('globalData')
+ return {
+ globalData
+ }
+ },
data() {
return {
msgType: 'info',
@@ -292,6 +323,7 @@
contactPhone: '', //联系人电话
contactName: '', //联系人姓名
contactEmail: '', //联系人邮箱
+ contactCompany: '', //联系人公司
csaNo: '', //客服NO
projectName: '',
projectNameList: [],
@@ -302,7 +334,6 @@
showLang: false, //显示选择语言
tempLang: '', //临时选中的语言
selectLang: '',
- contactCompany: '', //联系人公司
isShowUrgent: true, //是否加急
urgent: 0, //加急费用
isUrgentDisable: false, //是否禁用加急
@@ -364,6 +395,9 @@
methods: {
// 导入的方法
isEmpty,
+ phoneNum,
+ isValidPhone,
+ isValidEmail,
// 关闭dialog
closeCommendDialog() {
this.$refs.commendDialog.close()
@@ -617,7 +651,13 @@
},
//显示优惠卷弹窗
doShowCoupons() {
- this.$refs.selCouponsDialog.open()
+ if (this.couponsList.length <= 0) {
+ this.msgType = 'error'
+ this.msgTxt = '您暂时没有可以使用的优惠卷'
+ this.$refs.msg.open()
+ } else {
+ this.$refs.selCouponsDialog.open()
+ }
},
//关闭优惠卷弹窗
closeCoupons() {
@@ -648,6 +688,79 @@
_self.isUrgent = !_self.isUrgent
_self.countPrice()
},
+ //新建联系人姓名监听
+ inputContactName(e) {
+ this.contactName = e.detail.value
+ },
+ //新建联系人电话监听
+ inputContactPhone(e) {
+ console.log(e)
+ this.contactPhone = e.detail.value
+ },
+ //新建联系人公司监听
+ inputContactCompany(e) {
+ this.contactCompany = e.detail.value
+ },
+ //新建联系人邮箱监听
+ inputContactEmail(e) {
+ this.contactEmail = e.detail.value
+ },
+ //保存新建联系人
+ doSaveContact() {
+ const _self = this
+ if (_self.contactName == '') {
+ _self.msgTxt = '请输入联系人姓名'
+ _self.msgType = 'error'
+ _self.$refs.msg.open()
+ return
+ }
+ if (_self.contactPhone == '' || !isValidPhone(_self.contactPhone)) {
+ _self.msgTxt = '请输入正确的联系电话'
+ _self.msgType = 'error'
+ _self.$refs.msg.open()
+ return
+ }
+ if (_self.contactEmail != '') {
+ if (!isValidEmail(_self.contactEmail)) {
+ _self.msgTxt = '请输入正确的邮箱'
+ _self.msgType = 'error'
+ _self.$refs.msg.open()
+ return
+ }
+ }
+ const data = {
+ company: _self.contactCompany,
+ csaNo: _self.csaNo,
+ name: _self.contactName,
+ phone: _self.contactPhone,
+ email: _self.contactEmail
+ }
+ uni.showLoading({
+ title: '创建中...'
+ })
+ UserApi.doCreateContact(data)
+ .then(res => {
+ uni.hideLoading()
+ _self.msgTxt = '新建成功'
+ _self.msgType = 'success'
+ _self.$refs.msg.open()
+ _self.$refs.createContactDialog.close()
+ _self.contactEmail = ''
+ _self.contactPhone = ''
+ _self.contactName = ''
+ _self.contactCompany = ''
+ //获取一遍联系人
+ _self.doGetContactList()
+ })
+ .catch(err => {
+ console.log(err)
+ uni.hideLoading()
+ _self.msgTxt = err.msg ? err.msg : '新建失败,请稍后重试'
+ _self.msgType = 'error'
+ _self.$refs.msg.open()
+ // _self.$refs.crateContactDialog.close()
+ })
+ },
//计算价格
countPrice() {
const _self = this;
@@ -696,8 +809,8 @@
})
//构建参数
var list = []
- if (_self.isUrgent != '') {
- list = [_self.isUrgent]
+ if (_self.isUrgent != '' && _self.isUrgent) {
+ list = ['URGENT']
}
const data = {
applyContactCsaNo: _self.selectContact.csaNo, // 联系人客服编号
@@ -739,38 +852,6 @@
\ No newline at end of file
diff --git a/pages/mine/mineAccount/mineOrder/mineOrder.vue b/pages/mine/mineAccount/mineOrder/mineOrder.vue
index f2ff3b7..f737ff4 100644
--- a/pages/mine/mineAccount/mineOrder/mineOrder.vue
+++ b/pages/mine/mineAccount/mineOrder/mineOrder.vue
@@ -9,9 +9,8 @@
-
+
@@ -88,6 +87,10 @@
})
this.doRefreshList()
},
+ onPullDownRefresh() {
+ this.doRefreshList()
+ uni.stopPullDownRefresh()
+ },
methods: {
orderStatus,
proType,
diff --git a/pages/mine/mineIndex/mineIndex.vue b/pages/mine/mineIndex/mineIndex.vue
index b8dad5e..d1b6018 100644
--- a/pages/mine/mineIndex/mineIndex.vue
+++ b/pages/mine/mineIndex/mineIndex.vue
@@ -2,7 +2,7 @@
-
+
AI喵著
@@ -19,7 +19,7 @@
- 套餐包余额
+ 套餐包余额
全托管
@@ -81,21 +81,41 @@
animation: null,
alertMsg: '', //alertDialog提示内容
menuList: [{
- "icon": "ic-user",
- "title": "个人信息",
- "path": "/pages/mine/mineAccount/mineInfo/mineInfo"
+ icon: "ic-user",
+ title: "个人信息",
+ path: "/pages/mine/mineAccount/mineInfo/mineInfo"
}, {
- "icon": "ic-order",
- "title": "我的订单",
- "path": "/pages/mine/mineAccount/mineOrder/mineOrder"
+ icon: 'ic-msg',
+ title: '消息通知',
+ path: '/pages/mine/mineAccount/mineMsgNotice/mineMsgNotice'
}, {
- "icon": "ic-invoice",
- "title": "发票管理",
- "path": ""
+ icon: 'ic-refund',
+ title: '退款项目',
+ path: '/pages/copyright/refund/refund'
}, {
- "icon": "ic-contact",
- "title": "产权联系人",
- "path": "/pages/mine/mineAccount/mineContact/mineContact"
+ icon: 'ic-repair',
+ title: '补正项目',
+ path: '/pages/copyright/repair/repair'
+ }, {
+ icon: 'ic-invoice-info',
+ title: '发票抬头',
+ path: '/pages/mine/mineAccount/invoiceInfo/invoiceInfo'
+ }, {
+ icon: "ic-pay-record",
+ title: "资金流水",
+ path: "/pages/mine/mineAccount/minePayRecord/minePayRecord"
+ }, {
+ icon: "ic-order",
+ title: "我的订单",
+ path: "/pages/mine/mineAccount/mineOrder/mineOrder"
+ }, {
+ icon: "ic-invoice",
+ title: "发票管理",
+ path: "/pages/mine/mineAccount/mineInvoiceManage/mineInvoiceManage"
+ }, {
+ icon: "ic-contact",
+ title: "产权联系人",
+ path: "/pages/mine/mineAccount/mineContact/mineContact"
}],
msgType: 'info',
msgTxt: '',
@@ -121,6 +141,11 @@
this.getMineAccount()
this.getMinePackageCount()
},
+ onPullDownRefresh() {
+ this.getMineAccount()
+ this.getMinePackageCount()
+ uni.stopPullDownRefresh()
+ },
methods: {
//计算状态栏等高度
countBarHeight() {
@@ -197,15 +222,10 @@
//跳转页面
itemClick(e) {
const path = e.currentTarget.dataset.path
- const _self = this
- if (path == '') {
- _self.alertMsg = `鉴于功能特性,需在电脑端完成操作。请打开浏览器,登录网址${copyrightUrl},进行后续操作。`
- _self.$refs.alertDialog.open()
- } else {
- uni.navigateTo({
- url: path
- })
- }
+ const title = e.currentTarget.dataset.title
+ uni.navigateTo({
+ url: path
+ })
},
//获取单价
doGetPrice() {
@@ -228,10 +248,9 @@
})
.catch(err => {
uni.hideLoading()
- uni.showToast({
- title: '数据有误,请刷新页面',
- icon: 'error'
- })
+ _self.msgTxt = '网络错误,请刷新页面'
+ _self.msgType = 'error'
+ _self.$refs.msg.open()
})
},
//播放刷新动画
@@ -572,6 +591,67 @@
height: 18px;
}
+ .ic-pay-record {
+ background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ1MzkyMTQyNzY1IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjQ3ODEiIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiI+PHBhdGggZD0iTTYyNC4zNjA3MjcgODUxLjc4MTgxOGMwIDk1LjE4NTQ1NS0xMzkuNjM2MzY0IDE3Mi4yMTgxODItMzEyLjE4MDM2MyAxNzIuMjE4MTgyUzAgOTQ2LjgyNzYzNiAwIDg1MS43ODE4MTh2LTY3LjkwOTgxOGMwLjc0NDcyNyA5NC44MTMwOTEgMTQwLjE0ODM2NCAxNzEuNDczNDU1IDMxMS44NTQ1NDUgMTcxLjQ3MzQ1NXMzMTIuMTgwMzY0LTc3LjA3OTI3MyAzMTIuMTgwMzY0LTE3Mi4yMTgxODJWODUxLjc4MTgxOHogbTAtMTE5LjkwMTA5MWMwIDk1LjIzMi0xMzkuNjM2MzY0IDE3Mi4yMTgxODItMzEyLjE4MDM2MyAxNzIuMjE4MTgyUzAgODI2LjkyNjU0NSAwIDczMS43NDEwOTF2LTY3LjkwOTgxOGMwLjc0NDcyNyA5NC44MTMwOTEgMTQwLjE0ODM2NCAxNzEuNTIgMzExLjg1NDU0NSAxNzEuNTJzMzEyLjE4MDM2NC03Ny4wNzkyNzMgMzEyLjE4MDM2NC0xNzIuMjE4MTgydjY4LjY1NDU0NXogbS0zMTIuMTgwMzYzIDUyLjQ1NjcyOGMtMTcyLjIxODE4MiAwLTMxMi4xODAzNjQtNzcuMTI1ODE4LTMxMi4xODAzNjQtMTcyLjIxODE4MnMxMzkuNjM2MzY0LTE3Mi4yMTgxODIgMzEyLjE4MDM2NC0xNzIuMjE4MTgyIDMxMi4xODAzNjQgNzcuMTI1ODE4IDMxMi4xODAzNjMgMTcyLjIxODE4Mi0xMzkuNjgyOTA5IDE3Mi4wNzg1NDUtMzEyLjE4MDM2MyAxNzIuMDc4NTQ1ek0xMDI0IDY1MS42MzYzNjRjMCA5NS4xODU0NTUtMTM5LjYzNjM2NCAxNzIuMjE4MTgyLTMxMi4xODAzNjQgMTcyLjIxODE4MS05LjMwOTA5MSAwLTE4LjYxODE4Mi0wLjMyNTgxOC0yNy40NjE4MTgtMC43OTEyNzJ2LTQwLjQwMTQ1NWE2MC41MDkwOTEgNjAuNTA5MDkxIDAgMCAwLTMuMTE4NTQ1LTE5LjMxNjM2M2MwLjU1ODU0NS0yLjkzMjM2NCAwLjQ2NTQ1NS02LjAwNDM2NCAwLjgzNzgxOC04Ljk4MzI3M3ExNC43NTQ5MDkgMC43NDQ3MjcgMjkuNzQyNTQ1IDAuNzkxMjczYzE3Mi40OTc0NTUgMCAzMTIuMTgwMzY0LTc3LjA3OTI3MyAzMTIuMTgwMzY0LTE3Mi4yMTgxODJWNjUxLjYzNjM2NHogbTAtMTE5Ljg1NDU0NmMwIDk1LjE4NTQ1NS0xMzkuNjM2MzY0IDE3Mi4yMTgxODItMzEyLjE4MDM2NCAxNzIuMjE4MTgyLTkuMzA5MDkxIDAtMTguNjE4MTgyLTAuMjc5MjczLTI3LjQ2MTgxOC0wLjc5MTI3M3YtNDAuNDAxNDU0YTYwLjUwOTA5MSA2MC41MDkwOTEgMCAwIDAtMy4xMTg1NDUtMTkuMjY5ODE4YzAuNTU4NTQ1LTIuOTc4OTA5IDAuNDY1NDU1LTYuMDUwOTA5IDAuODM3ODE4LTkuMDI5ODE5cTE0Ljc1NDkwOSAwLjc5MTI3MyAyOS43NDI1NDUgMC43OTEyNzNDODg0LjM2MzYzNiA2MzUuNTMxNjM2IDEwMjQgNTU4LjU0NTQ1NSAxMDI0IDQ2My4yNjY5MDl2NjguNzAxMDkxeiBtMC0xMTkuOTQ3NjM2YzAgOTUuMjc4NTQ1LTEzOS42MzYzNjQgMTcyLjIxODE4Mi0zMTIuMTgwMzY0IDE3Mi4yMTgxODJxLTE1LjA4MDcyNyAwLTMwLjIwOC0wLjg4NDM2NEExNzIuNzMwMTgyIDE3Mi43MzAxODIgMCAwIDAgNjUwLjUxOTI3MyA1MTJhNTUwLjAyNzYzNiA1NTAuMDI3NjM2IDAgMCAwIDYxLjI1MzgxOCAzLjM5NzgxOGMxNzIuNDk3NDU1IDAgMzEyLjE4MDM2NC03Ny4xMjU4MTggMzEyLjE4MDM2NC0xNzIuMjE4MTgydjY4LjY1NDU0NnogbTAtMTE5Ljg1NDU0NmMwIDk1LjIzMi0xMzkuNjM2MzY0IDE3Mi4yMTgxODItMzEyLjE4MDM2NCAxNzIuMjE4MTgyYTUzMy4yNzEyNzMgNTMzLjI3MTI3MyAwIDAgMS0xMzAuMzI3MjcyLTE1LjgyNTQ1NCA0MDcuNTUyIDQwNy41NTIgMCAwIDAtMTEzLjUyNDM2NC00OS4wMTIzNjQgMTM1LjgxOTYzNiAxMzUuODE5NjM2IDAgMCAxLTY4LjMyODcyNy0xMDcuNDczNDU1VjIyMy45NzY3MjdjMC43OTEyNzMgOTQuODEzMDkxIDE0MC4xOTQ5MDkgMTcxLjU2NjU0NSAzMTIuMTMzODE4IDE3MS41NjY1NDZTMTAyNCAzMTguNzQzMjczIDEwMjQgMjIzLjQxODE4MnY2OC43MDEwOTF6TTcxMS43NzMwOTEgMzQ0LjQzNjM2NGMtMTcyLjIxODE4MiAwLTMxMi4xODAzNjQtNzcuMDc5MjczLTMxMi4xODAzNjQtMTcyLjIxODE4MnMxMzkuNjM2MzY0LTE3Mi4yMTgxODIgMzEyLjE4MDM2NC0xNzIuMjE4MTgyUzEwMjQgNzcuMDc5MjczIDEwMjQgMTcyLjIxODE4MnMtMTM5LjYzNjM2NCAxNzIuMjE4MTgyLTMxMi4yMjY5MDkgMTcyLjIxODE4MnoiIGZpbGw9IiNGRkJBMzQiIHAtaWQ9IjQ3ODIiPjwvcGF0aD48L3N2Zz4=');
+ background-repeat: no-repeat;
+ background-size: cover;
+ width: 24px;
+ height: 24px;
+ }
+
+ .ic-invoice-info {
+ background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ1NzM3NDQ3MTAwIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjQ0MTMiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTUxMiA1MTJtLTQ3NS40Mjg1NzEgMGE0NzUuNDI4NTcxIDQ3NS40Mjg1NzEgMCAxIDAgOTUwLjg1NzE0MiAwIDQ3NS40Mjg1NzEgNDc1LjQyODU3MSAwIDEgMC05NTAuODU3MTQyIDBaIiBmaWxsPSIjN0U0RkZGIiBwLWlkPSI0NDE0Ij48L3BhdGg+PHBhdGggZD0iTTY1Ni4wOTE0MjkgNDIyLjc2NTcxNGExNi43NDk3MTQgMTYuNzQ5NzE0IDAgMCAxIDE3LjE4ODU3MSAxNS43OTg4NTd2MzA0LjM0NzQyOWE2LjU4Mjg1NyA2LjU4Mjg1NyAwIDAgMS0zLjUxMDg1NyA1LjQ4NTcxNCA3LjE2OCA3LjE2OCAwIDAgMS02LjcyOTE0MyAwYy0zLjgwMzQyOS0yLjQxMzcxNC02NC4yMTk0MjktMzcuODE0ODU3LTY0LjIxOTQyOS0zNy44MTQ4NTdhMTQuNDA5MTQzIDE0LjQwOTE0MyAwIDAgMC0xNC4xMTY1NzEgMGwtNjUuMTcwMjg2IDM3LjUyMjI4NmExNy41NTQyODYgMTcuNTU0Mjg2IDAgMCAxLTcuNjggMS4yNDM0MjggMjAuMjYwNTcxIDIwLjI2MDU3MSAwIDAgMS04LjA0NTcxNC0xLjI0MzQyOGwtNjEuOTUyLTM2Ljg2NGExNC40MDkxNDMgMTQuNDA5MTQzIDAgMCAwLTE0LjExNjU3MSAwbC0yMy40MDU3MTUgMTMuNDU4Mjg2LTE1Ljc5ODg1NyA5LjA2OTcxNC0yNi42MjQgMTUuMjg2ODU3YTguMjY1MTQzIDguMjY1MTQzIDAgMCAxLTcuMzE0Mjg2LTAuMzY1NzE0IDcuNjA2ODU3IDcuNjA2ODU3IDAgMCAxLTMuODc2NTcxLTUuNzc4Mjg2VjQzOS4wNzY1NzFhMTYuMDkxNDI5IDE2LjA5MTQyOSAwIDAgMSA1LjEyLTExLjYyOTcxNCAxNy42Mjc0MjkgMTcuNjI3NDI5IDAgMCAxIDEyLjE0MTcxNC00Ljc1NDI4NnogbS00Ny4wMzA4NTggMTQ4LjE4NzQyOUg0MTQuOTM5NDI5YTE1Ljk0NTE0MyAxNS45NDUxNDMgMCAwIDAtMTYuMDkxNDI5IDE1LjUwNjI4NmMwIDguNTU3NzE0IDcuMjQxMTQzIDE1LjQzMzE0MyAxNi4wOTE0MjkgMTUuNTc5NDI4aDE5NC4xMjExNDJjNS44NTE0MjkgMC4wNzMxNDMgMTEuMzM3MTQzLTIuODUyNTcxIDE0LjMzNi03LjY4YTE0LjkyMTE0MyAxNC45MjExNDMgMCAwIDAgMC0xNS43MjU3MTQgMTYuNDU3MTQzIDE2LjQ1NzE0MyAwIDAgMC0xNC4zMzYtNy42OHogbTAtNzAuNDM2NTcySDQxNC45Mzk0MjlhMTYuNDU3MTQzIDE2LjQ1NzE0MyAwIDAgMC0xNC4zMzYgNy42OCAxNC45MjExNDMgMTQuOTIxMTQzIDAgMCAwIDAgMTUuNzI1NzE1YzIuOTk4ODU3IDQuODI3NDI5IDguNDg0NTcxIDcuNzUzMTQzIDE0LjMzNiA3LjY4aDE5NC4xMjExNDJjNS44NTE0MjkgMC4wNzMxNDMgMTEuMzM3MTQzLTIuOTI1NzE0IDE0LjMzNi03LjY4YTE0LjkyMTE0MyAxNC45MjExNDMgMCAwIDAgMC0xNS43MjU3MTUgMTYuNDU3MTQzIDE2LjQ1NzE0MyAwIDAgMC0xNC4zMzYtNy42OHpNNzI0LjExNDI4NiAzNDIuMjM1NDI5YzE0LjExNjU3MSAwIDI1LjYgMTAuOTcxNDI5IDI1LjYgMjQuMzU2NTcxdjExMS45MDg1NzFhMjUuNTI2ODU3IDI1LjUyNjg1NyAwIDAgMS0yNS42IDI0LjQyOTcxNWgtMzMuNTcyNTcyVjQ0Mi41MTQyODZoMS45NzQ4NTdhMjAuMzMzNzE0IDIwLjMzMzcxNCAwIDAgMCAyMC40OC0xOS43NDg1NzIgMjAuMzMzNzE0IDIwLjMzMzcxNCAwIDAgMC0yMC40OC0xOS44OTQ4NTdIMzMxLjQ4MzQyOWEyMC45OTIgMjAuOTkyIDAgMCAwLTE4LjIxMjU3MiA5Ljg3NDI4NiAxOS4wMTcxNDMgMTkuMDE3MTQzIDAgMCAwIDAgMTkuOTY4IDIwLjk5MiAyMC45OTIgMCAwIDAgMTguMjg1NzE0IDkuODAxMTQzaDEuOTAxNzE1djYwLjQxNmgtMzMuNjQ1NzE1YTI1LjA4OCAyNS4wODggMCAwIDEtMjUuNTI2ODU3LTI0LjQyOTcxNXYtMTExLjkwODU3MWMwLTEzLjQ1ODI4NiAxMS40ODM0MjktMjQuMzU2NTcxIDI1LjYtMjQuMzU2NTcxeiIgZmlsbD0iI0ZGRkZGRiIgcC1pZD0iNDQxNSI+PC9wYXRoPjwvc3ZnPg==');
+ background-repeat: no-repeat;
+ background-size: cover;
+ width: 24px;
+ height: 24px;
+ }
+
+ .ic-unbind {
+ background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ1NDAwMzc2MjkxIiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjYwMTgiIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiI+PHBhdGggZD0iTTUxMiA5ODRDMjUxLjc1IDk4NCAzOS45OSA3NzIuMjYgMzkuOTkgNTEyUzI1MS43NSA0MCA1MTIgNDBzNDcyLjAxIDIxMS43NCA0NzIuMDEgNDcyUzc3Mi4yNSA5ODQgNTEyIDk4NHoiIGZpbGw9IiNGRkY4RUYiIHAtaWQ9IjYwMTkiPjwvcGF0aD48cGF0aCBkPSJNNTEyIDgwQzI3My44MiA4MCA3OS45NyAyNzMuNzkgNzkuOTcgNTEyczE5My44NCA0MzIgNDMyLjAyIDQzMiA0MzIuMDMtMTkzLjc5IDQzMi4wMy00MzJDOTQ0LjAzIDI3My43OSA3NTAuMTggODAgNTEyIDgweiBtMC04MGMyODIuNzggMCA1MTIgMjI5LjIzIDUxMiA1MTJzLTIyOS4yMiA1MTItNTEyIDUxMlMwIDc5NC43NyAwIDUxMiAyMjkuMjIgMCA1MTIgMHoiIGZpbGw9IiNGRkE3MzgiIHAtaWQ9IjYwMjAiPjwvcGF0aD48cGF0aCBkPSJNMjc4LjYzIDI3OC42NmMyNy4zNC0yNy4yOSA3MS43My0yNy4yOSA5OS4wMiAwbDM2Ny43MiAzNjcuNjljMjcuMjkgMjcuMjkgMjcuMjkgNzEuNyAwIDk5LTI3LjM0IDI3LjI5LTcxLjczIDI3LjI5LTk5LjAyIDBsLTM2Ny43Mi0zNjcuN2MtMjcuMjktMjcuMjktMjcuMjktNzEuNyAwLTk4Ljk5eiIgZmlsbD0iI0ZGRkZGRiIgcC1pZD0iNjAyMSI+PC9wYXRoPjxwYXRoIGQ9Ik03MTcuMDYgNzE3LjA2YzExLjcyLTExLjY5IDExLjcyLTMwLjczIDAtNDIuNDJsLTM2Ny42Ny0zNjcuN2MtMTEuNzMtMTEuNy0zMC43Ny0xMS43LTQyLjQ1IDAtMTEuNjcgMTEuNy0xMS43MyAzMC43MyAwIDQyLjQzbDM2Ny42NyAzNjcuNjljMTEuNzMgMTEuNyAzMC43NyAxMS43IDQyLjQ1IDB6IG01Ni41NyA1Ni41N2MtNDIuOTYgNDIuOTYtMTEyLjU5IDQyLjk2LTE1NS41NSAwbC0zNjcuNzItMzY3LjdjLTQyLjk2LTQyLjk2LTQyLjk2LTExMi42MSAwLTE1NS41NiA0Mi45Ni00Mi45NiAxMTIuNTktNDIuOTYgMTU1LjU1IDBsMzY3LjcyIDM2Ny42OWM0Mi45NiA0Mi45NyA0Mi45NiAxMTIuNjIgMCAxNTUuNTd6IiBmaWxsPSIjRkZBNzM4IiBwLWlkPSI2MDIyIj48L3BhdGg+PHBhdGggZD0iTTczMC41MiAzOTguNzZsLTMzOS40IDMzOS40MWMtNy41MyA3LjUtMTcuNjYgMTEuNzEtMjguMzEgMTEuNzEtMTAuNiAwLTIwLjc5LTQuMjEtMjguMjYtMTEuNzFsLTQyLjQ1LTQyLjQyYy0zLjY5LTMuNzEtNi42Ni04LjEzLTguNjUtMTIuOTgtMi00Ljg1LTMuMDctMTAuMDUtMy4wNy0xNS4zczEuMDgtMTAuNDYgMy4wNy0xNS4zMWMyLTQuODUgNC45Ny05LjI2IDguNjUtMTIuOThsMzM5LjQtMzM5LjQxYzMuNzQtMy43MSA4LjE0LTYuNjYgMTMtOC42N2EzOS45NzQgMzkuOTc0IDAgMCAxIDE1LjMxLTMuMDRjNS4yMiAwIDEwLjQ0IDEuMDMgMTUuMzEgMy4wNCA0Ljg2IDIuMDEgOS4yNyA0Ljk2IDEyLjk1IDguNjdsNDIuNDUgNDIuNDNjNy40OCA3LjUgMTEuNzMgMTcuNjggMTEuNzMgMjguMjggMCAxMC42MS00LjI1IDIwLjc4LTExLjczIDI4LjI4eiIgZmlsbD0iI0ZGRjhFRiIgcC1pZD0iNjAyMyI+PC9wYXRoPjxwYXRoIGQ9Ik03MTMuMTYgMzcxLjQxbC0zMzkuNCAzMzkuNDFjLTcuNTMgNy41MS0xNy42NiAxMS43Mi0yOC4zMSAxMS43Mi0xMC42IDAtMjAuNzktNC4yMi0yOC4yNi0xMS43MmEzOS44OCAzOS44OCAwIDAgMS0xMS43My0yOC4yOGMwLTEwLjYxIDQuMi0yMC43OCAxMS43My0yOC4yOGwzMzkuNC0zMzkuNDFjNy41My03LjQ1IDE3LjY2LTExLjYyIDI4LjI2LTExLjU5IDEwLjU1IDAuMDIgMjAuNjggNC4yNCAyOC4yMSAxMS43MmEzOS45MDUgMzkuOTA1IDAgMCAxIDExLjY3IDI4LjJjMC4wNiAxMC41Ni00LjE0IDIwLjcyLTExLjU3IDI4LjIzeiIgZmlsbD0iI0ZGQTczOCIgcC1pZD0iNjAyNCI+PC9wYXRoPjwvc3ZnPg==');
+ background-repeat: no-repeat;
+ background-size: cover;
+ width: 24px;
+ height: 24px;
+ }
+
+ .ic-msg {
+ background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ2NTE1Mjg3MDE2IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI2MzIiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTkzNC42Mjc1NTYgODI3LjczMzMzM2EyNzMuMDA5Nzc4IDI3My4wMDk3NzggMCAwIDAtMTA2LjMyNTMzNC0yMDQuNTcyNDQ0VjM5Ny40MjU3NzhjMC0xMzAuMzg5MzMzLTkyLjEwMzExMS0yNDAuMDcxMTExLTIxMy45MDIyMjItMjY2LjA2OTMzNHYtNS4xMkExMDcuOTc1MTExIDEwNy45NzUxMTEgMCAwIDAgNTA3LjE2NDQ0NCAxNy45NzY4ODljLTU4LjgyMzExMSAwLTEwNy4wMDggNDguNjk2ODg5LTEwNy4wMDggMTA4LjE0NTc3OHY1LjE3Njg4OWMtMTIxLjc0MjIyMiAyNS45OTgyMjItMjEzLjkwMjIyMiAxMzUuNjgtMjEzLjkwMjIyMiAyNjYuMDY5MzMzdjIyNS44NDg4ODlhMjczLjAwOTc3OCAyNzMuMDA5Nzc4IDAgMCAwLTEwNi4zODIyMjIgMjA0LjYyOTMzM2gxMDYuMzgyMjIydjAuNjgyNjY3SDgyOC4zMDIyMjJ2LTAuNjgyNjY3aDEwNi4zMjUzMzR2LTAuMTEzNzc4eiBtLTQ0OS45OTExMTIgMTgyLjk1NDY2N2gyNi41NjcxMTJjNjkuNzQ1Nzc4IDAgMTI3LjY1ODY2Ny01My4yNDggMTM2LjAyMTMzMy0xMjEuNDAwODg5SDM2Ny41MDIyMjJjOC40MTk1NTYgNjguMTUyODg5IDY2LjM4OTMzMyAxMjEuNDAwODg5IDEzNi4wNzgyMjIgMTIxLjQwMDg4OUg0ODQuNjkzMzMzeiIgZmlsbD0iI0ZGQjgwMCIgcC1pZD0iMjYzMyI+PC9wYXRoPjwvc3ZnPg==');
+ background-repeat: no-repeat;
+ background-size: cover;
+ width: 24px;
+ height: 24px;
+ }
+
+ .custom-tips {
+ margin-top: 82px;
+ }
+
+ .ic-refund {
+ background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ2NTgyMTEwOTk2IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjM1NzYiIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiI+PHBhdGggZD0iTTU1MC4wMjc2MzYgMjI3Ljc0NjkwOWEyNzkuMjcyNzI3IDI3OS4yNzI3MjcgMCAxIDEgMCA1NTguNTQ1NDU1IDI3OS4yNzI3MjcgMjc5LjI3MjcyNyAwIDAgMSAwLTU1OC41NDU0NTV6IG0tNTQuNDU4MTgxIDE0Mi4xNDk4MThhMjIuMDYyNTQ1IDIyLjA2MjU0NSAwIDAgMC0zMS4xODU0NTUgMzEuMTg1NDU1bDQ3LjEwNCA0Ny4xMDRoLTQyLjM1NjM2NGEyMi4wNjI1NDUgMjIuMDYyNTQ1IDAgMSAwIDAgNDQuMTI1MDkxaDU4LjgzMzQ1NXYyOS4zNzAxODJINDY5LjE3ODE4MmEyMi4wNjI1NDUgMjIuMDYyNTQ1IDAgMSAwIDAgNDQuMTI1MDloNTguNzg2OTA5djczLjU0MTgxOWEyMi4wNjI1NDUgMjIuMDYyNTQ1IDAgMCAwIDQ0LjEyNTA5MSAwdi03My41NDE4MTloNTguNzg2OTA5YTIyLjA2MjU0NSAyMi4wNjI1NDUgMCAxIDAgMC00NC4wNzg1NDVINTcyLjA0MzYzNnYtMjkuNDE2NzI3aDU4LjgzMzQ1NWEyMi4wNjI1NDUgMjIuMDYyNTQ1IDAgMSAwIDAtNDQuMDc4NTQ2aC00Mi4zNTYzNjRsNDcuMTk3MDkxLTQ3LjE1MDU0NSAxLjU4MjU0Ni0xLjgxNTI3M2EyMi4wNjI1NDUgMjIuMDYyNTQ1IDAgMCAwLTMyLjc2OC0yOS4zNzAxODJMNTUyLjQ5NDU0NSA0MjEuODQxNDU1bC0xLjU4MjU0NSAxLjgxNTI3Mi0wLjkzMDkwOSAxLjI1NjcyOGEyMi4xNTU2MzYgMjIuMTU1NjM2IDAgMCAwLTIuNTEzNDU1LTMuMDcybC01MS45OTEyNzItNTEuOTQ0NzI4eiIgZmlsbD0iIzNCOERGRiIgcC1pZD0iMzU3NyI+PC9wYXRoPjxwYXRoIGQ9Ik05NzcuNDU0NTQ1IDUxMmMwLTIzMS4zMzA5MDktMTg4LjUwOTA5MS00MTguOTA5MDkxLTQyMS4wMDM2MzYtNDE4LjkwOTA5MS0yMzIuNTQxMDkxIDAtNDIxLjA1MDE4MiAxODcuNTc4MTgyLTQyMS4wNTAxODIgNDE4LjkwOTA5MWEzMC4wMjE4MTggMzAuMDIxODE4IDAgMCAwIDMwLjA2ODM2NCAyOS4xODRjMTYuMzM3NDU1IDAgMjkuNjk2LTEyLjkzOTYzNiAzMC4xMTQ5MDktMjkuMTg0IDAtMTk4LjI4MzYzNiAxNjEuNTEyNzI3LTM1OS4wNTE2MzYgMzYwLjg2NjkwOS0zNTkuMDUxNjM2IDE5OS4zMDc2MzYgMCAzNjAuODY2OTA5IDE2MC43MjE0NTUgMzYwLjg2NjkwOSAzNTkuMDUxNjM2IDAgMTk4LjI4MzYzNi0xNjEuNTU5MjczIDM1OS4wNTE2MzYtMzYwLjg2NjkwOSAzNTkuMDUxNjM2YTM2MC42MzQxODIgMzYwLjYzNDE4MiAwIDAgMS0xNjguMjYxODE4LTQxLjI4NTgxOCAzMC4xNjE0NTUgMzAuMTYxNDU1IDAgMCAwLTQwLjAyOTA5MSAxMi44IDI5LjgzNTYzNiAyOS44MzU2MzYgMCAwIDAgMTEuOTYyMTgyIDQwLjEyMjE4MkE0MjAuOTU3MDkxIDQyMC45NTcwOTEgMCAwIDAgNTU2LjQ1MDkwOSA5MzAuOTA5MDkxQzc4OC45NDU0NTUgOTMwLjkwOTA5MSA5NzcuNDU0NTQ1IDc0My4zMzA5MDkgOTc3LjQ1NDU0NSA1MTJ6TTE3OS43NTg1NDUgNTk3LjgyOTgxOGw1NC41NTEyNzMtNzIuNDI0NzI3YTE3LjY4NzI3MyAxNy42ODcyNzMgMCAwIDAtMTQuMjQyOTA5LTI4LjM5MjcyN0gxMTAuOTE3ODE4YTE3LjY4NzI3MyAxNy42ODcyNzMgMCAxIDAtMTQuMjQyOTA5IDI4LjM5MjcyN2w1NC41NTEyNzMgNzIuNDI0NzI3YTE3Ljg3MzQ1NSAxNy44NzM0NTUgMCAwIDAgMjguNTMyMzYzIDB6IiBmaWxsPSIjM0I4REZGIiBwLWlkPSIzNTc4Ij48L3BhdGg+PC9zdmc+');
+ background-repeat: no-repeat;
+ background-size: cover;
+ width: 24px;
+ height: 24px;
+ }
+
+ .ic-repair {
+ background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ2NTgyMjU3MDY5IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjEyNjg2IiB3aWR0aD0iMTYiIGhlaWdodD0iMTYiPjxwYXRoIGQ9Ik04NjEuMTg0IDk1Mi4zMmMzMy4yOCAwIDYwLjQxNi0yNy42NDggNjAuNDE2LTYxLjQ0VjEzMy4xMmMwLTMzLjc5Mi0yNy4xMzYtNjEuNDQtNjAuNDE2LTYxLjQ0SDE2Mi44MTZDMTI5LjUzNiA3MS42OCAxMDIuNCA5OS4zMjggMTAyLjQgMTMzLjEydjc1Ny43NmMwIDMzLjc5MiAyNy4xMzYgNjEuNDQgNjAuNDE2IDYxLjQ0aDY5OC4zNjh6IG0tMTYuODk2LTgwMy44NHY3MjcuMDRIMTc5LjJWMTQ4LjQ4aDY2NS4wODh6IiBwLWlkPSIxMjY4NyIgZmlsbD0iIzEyOTZkYiI+PC9wYXRoPjxwYXRoIGQ9Ik03MTEuNjggMjE1LjU1MkgzMTIuMzJjLTIwLjk5MiAwLTM4LjQgMTcuNDA4LTM4LjQgMzguNHMxNy40MDggMzguNCAzOC40IDM4LjRoMzk5LjM2YzIwLjk5MiAwIDM4LjQtMTcuNDA4IDM4LjQtMzguNHMtMTcuNDA4LTM4LjQtMzguNC0zOC40eiBtMCAxMjhIMzEyLjMyYy0yMC45OTIgMC0zOC40IDE3LjQwOC0zOC40IDM4LjRzMTcuNDA4IDM4LjQgMzguNCAzOC40aDM5OS4zNmMyMC45OTIgMCAzOC40LTE3LjQwOCAzOC40LTM4LjRzLTE3LjQwOC0zOC40LTM4LjQtMzguNHpNNTMxLjk2OCA2NDIuMDQ4Yy0xNC4zMzYgMTMuODI0LTI5LjE4NCAyOS42OTYtNDEuNDcyIDQxLjk4NCAxMy44MjQgMTMuODI0IDI3LjY0OCAyNy4xMzYgMzIuNzY4IDMyLjc2OGwtMjguNjcyIDM3LjM3NmMtMTEuMjY0LTE2LjM4NC0zMy4yOC00MS40NzItNTIuMjI0LTYyLjQ2NHYxNTUuMTM2aC00OS4xNTJWNzA2LjU2Yy0xNy40MDggMTUuODcyLTMzLjc5MiAzMC4yMDgtNTEuMiA0MS45ODQtNC42MDgtMTMuMzEyLTE3LjQwOC0zNy4zNzYtMjUuNi00Ni41OTIgNDYuMDgtMjcuMTM2IDkzLjY5Ni03NS4yNjQgMTIzLjM5Mi0xMjQuOTI4SDMyOS4yMTZ2LTQ0LjAzMmg3Mi43MDRjLTkuMjE2LTEzLjgyNC0yMy41NTItMzAuNzItMzYuMzUyLTQ0LjAzMmwzNS4zMjgtMjUuMDg4YzE2Ljg5NiAxNC44NDggMzUuODQgMzUuODQgNDQuNTQ0IDUwLjE3NmwtMjQuNTc2IDE4Ljk0NGg0Ni4wOGw4LjcwNC0yLjA0OCAyOC4xNiAxOS45NjhjLTEzLjgyNCAzMi43NjgtMzMuNzkyIDY0LjUxMi01NS44MDggOTQuMjA4IDQuNjA4IDMuNTg0IDkuNzI4IDguMTkyIDE1LjM2IDEzLjMxMiAxMS43NzYtMTUuMzYgMjUuMDg4LTMyLjc2OCAzMi4yNTYtNDYuNTkybDM2LjM1MiAzMC4yMDh6IG04MC4zODQtNTYuODMyYzI5LjY5NiAyNS4wODggNzMuNzI4IDYxLjQ0IDk1LjIzMiA4NC45OTJsLTM5LjkzNiAzNS44NGMtMTUuMzYtMTkuNDU2LTQ2LjA4LTQ3LjYxNi03Mi43MDQtNzEuNjh2MjEwLjk0NGgtNTMuMjQ4VjQ2NC44OTZoNTMuMjQ4VjU5OS4wNGwxNy40MDgtMTMuODI0eiIgcC1pZD0iMTI2ODgiIGZpbGw9IiMxMjk2ZGIiPjwvcGF0aD48L3N2Zz4=');
+ background-repeat: no-repeat;
+ background-size: cover;
+ width: 24px;
+ height: 24px;
+ }
+
+ .icon-refresh {
+ background-image: url('data:image/svg+xml;charset=utf-8;base64,PHN2ZyB0PSIxNzQ0MTY2MTkyNTg5IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjU2MDkiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiI+PHBhdGggZD0iTTkzNi41OTQyODYgNjAzLjQyODU3MXEwIDIuODUyNTcxLTAuNTg1MTQzIDQuMDIyODU3LTM2LjU3MTQyOSAxNTMuMTYxMTQzLTE1My4xNjExNDMgMjQ4LjMydC0yNzMuMTE1NDI5IDk1LjE1ODg1N3EtODMuNDU2IDAtMTYxLjQyNjI4Ni0zMS40NTE0Mjl0LTEzOS4xMTc3MTQtODkuNzQ2Mjg2bC03My43MjggNzMuNzI4cS0xMC44MjUxNDMgMTAuODI1MTQzLTI1Ljc0NjI4NiAxMC44MjUxNDN0LTI1Ljc0NjI4Ni0xMC44MjUxNDMtMTAuODI1MTQzLTI1Ljc0NjI4NmwwLTI1NnEwLTE0Ljg0OCAxMC44MjUxNDMtMjUuNzQ2Mjg2dDI1Ljc0NjI4Ni0xMC44MjUxNDNsMjU2IDBxMTQuODQ4IDAgMjUuNzQ2Mjg2IDEwLjgyNTE0M3QxMC44MjUxNDMgMjUuNzQ2Mjg2LTEwLjgyNTE0MyAyNS43NDYyODZsLTc4LjI2Mjg1NyA3OC4yNjI4NTdxNDAuNTk0Mjg2IDM3Ljc0MTcxNCA5Mi4wMTM3MTQgNTguMjk0ODU3dDEwNi44NjE3MTQgMjAuNTUzMTQzcTc2LjU4MDU3MSAwIDE0Mi44NDgtMzcuMTU2NTcxdDEwNi4yNzY1NzEtMTAyLjI1MzcxNHE2LjI5MDI4Ni05LjcyOCAzMC4yODExNDMtNjYuODUyNTcxIDQuNTM0ODU3LTEzLjE2NTcxNCAxNy4xMTU0MjktMTMuMTY1NzE0bDEwOS43MTQyODYgMHE3LjQ2MDU3MSAwIDEyLjg3MzE0MyA1LjQxMjU3MXQ1LjQxMjU3MSAxMi44NzMxNDN6TTk1MC44NTcxNDMgMTQ2LjI4NTcxNGwwIDI1NnEwIDE0Ljg0OC0xMC44MjUxNDMgMjUuNzQ2Mjg2dC0yNS43NDYyODYgMTAuODI1MTQzbC0yNTYgMHEtMTQuODQ4IDAtMjUuNzQ2Mjg2LTEwLjgyNTE0M3QtMTAuODI1MTQzLTI1Ljc0NjI4NiAxMC44MjUxNDMtMjUuNzQ2Mjg2bDc4Ljg0OC03OC44NDhxLTg0LjU1MzE0My03OC4yNjI4NTctMTk5LjQ2MDU3MS03OC4yNjI4NTctNzYuNTgwNTcxIDAtMTQyLjg0OCAzNy4xNTY1NzF0LTEwNi4yNzY1NzEgMTAyLjI1MzcxNHEtNi4yOTAyODYgOS43MjgtMzAuMjgxMTQzIDY2Ljg1MjU3MS00LjUzNDg1NyAxMy4xNjU3MTQtMTcuMTE1NDI5IDEzLjE2NTcxNGwtMTEzLjczNzE0MyAwcS03LjQ2MDU3MSAwLTEyLjg3MzE0My01LjQxMjU3MXQtNS40MTI1NzEtMTIuODczMTQzbDAtNC4wMjI4NTdxMzcuMTU2NTcxLTE1My4xNjExNDMgMTU0LjI1ODI4Ni0yNDguMzJ0Mjc0LjI4NTcxNC05NS4xNTg4NTdxODMuNDU2IDAgMTYyLjMwNCAzMS43NDR0MTM5Ljk5NTQyOSA4OS40NTM3MTRsNzQuMzEzMTQzLTczLjcyOHExMC44MjUxNDMtMTAuODI1MTQzIDI1Ljc0NjI4Ni0xMC44MjUxNDN0MjUuNzQ2Mjg2IDEwLjgyNTE0MyAxMC44MjUxNDMgMjUuNzQ2Mjg2eiIgZmlsbD0iIzUzMkEwMCIgcC1pZD0iNTYxMCI+PC9wYXRoPjwvc3ZnPg==');
+ background-size: cover;
+ background-repeat: no-repeat;
+ margin-left: 5px;
+ width: 18px;
+ height: 18px;
+ }
+
.custom-tips {
margin-top: 82px;
}
diff --git a/pages/pay/payState/payState.vue b/pages/pay/payState/payState.vue
index a25df70..4145f6f 100644
--- a/pages/pay/payState/payState.vue
+++ b/pages/pay/payState/payState.vue
@@ -1,5 +1,5 @@
-
+
交易成功
diff --git a/pages/pay/payment/payment.vue b/pages/pay/payment/payment.vue
index ba85ecd..853619f 100644
--- a/pages/pay/payment/payment.vue
+++ b/pages/pay/payment/payment.vue
@@ -1,5 +1,5 @@
-
+
@@ -73,8 +73,8 @@
-
- 确认充值
+
diff --git a/pages/pay/publicPay/publicPay.vue b/pages/pay/publicPay/publicPay.vue
index eba6bc8..e03035a 100644
--- a/pages/pay/publicPay/publicPay.vue
+++ b/pages/pay/publicPay/publicPay.vue
@@ -1,5 +1,5 @@
-
+
@@ -31,10 +31,9 @@
打款时间
-
-
-
+
@@ -42,7 +41,7 @@
+ :auto-upload="false" :image-styles="imageStyles" @select="uploadImgToNet">
@@ -75,17 +74,17 @@
请打款时必须按照以上备注填写
-
-
- 金额:
- {{payMoney}}元
- ({{packageName}})
+
- 完成充值
+
+
+
-
-
-