diff --git a/yudao-ui-admin/src/views/mall/market/banner/index.vue b/yudao-ui-admin/src/views/mall/market/banner/index.vue index ad22e970c..a311be9d4 100644 --- a/yudao-ui-admin/src/views/mall/market/banner/index.vue +++ b/yudao-ui-admin/src/views/mall/market/banner/index.vue @@ -118,8 +118,7 @@ export default { // 表单校验 rules: { title: [{required: true, message: "标题不能不空", trigger: "blur"}], - picUrl: [{required: true, message: "图片地址不能为空", trigger: "blur"}], - // url: [{required: true, message: "跳转地址不能为空", trigger: "blur"}] + picUrl: [{required: true, message: "图片地址不能为空", trigger: "blur"}] } }; }, diff --git a/yudao-ui-app/libs/pay.js b/yudao-ui-app/libs/pay.js index 0fcc8b728..5cd834dc5 100644 --- a/yudao-ui-app/libs/pay.js +++ b/yudao-ui-app/libs/pay.js @@ -15,7 +15,6 @@ const payTypes = ['WXPAY', 'ALIPAY'] * @param wxPaySuccess // 微信支付下单支付成功回调 * @param aliPaySuccess // 支付宝支付下单成功回调 */ -const unityPay = (options) => { let _options = { payInfo: {}, payType: '', @@ -24,6 +23,9 @@ const unityPay = (options) => { wxPaySuccess: () => {}, aliPaySuccess: () => {} } + +const unityPay = (options) => { + Object.assign(_options, options) if (!_options.payType) { return util.Tips({ diff --git a/yudao-ui-app/pages/index/index.vue b/yudao-ui-app/pages/index/index.vue index 242fb23a5..d3402fe90 100644 --- a/yudao-ui-app/pages/index/index.vue +++ b/yudao-ui-app/pages/index/index.vue @@ -362,9 +362,7 @@ handleCustomer(value){ switch (value) { case '电话客服': - if(this.tenantInfo.serviceMobile){ - window.location.href = `tel:${this.tenantInfo.serviceMobile}` - } + window.location.href = `tel:4008009935` break; case '微信客服': if (this.tenantInfo.wxKfUrl) { diff --git a/yudao-ui-app/pages/member_renew/index.vue b/yudao-ui-app/pages/member_renew/index.vue index 913a6bd6d..7e49f45b9 100644 --- a/yudao-ui-app/pages/member_renew/index.vue +++ b/yudao-ui-app/pages/member_renew/index.vue @@ -3,7 +3,7 @@ - + @@ -78,6 +78,12 @@ import store from '@/store/index'; userPhone:'' }, rules: { + userName: [{ + required: true, + message: '姓名不能为空', + // 触发器可以同时用blur和change + trigger: ['change', 'blur'] + }], userPhone: [ { required: true, @@ -136,6 +142,7 @@ import store from '@/store/index'; }) this.payInfo = { userPhone: store.state.app.userInfo.mobile, + userName: this.form.userName, orderInfos } }else{ diff --git a/yudao-ui-app/pages/user/index.vue b/yudao-ui-app/pages/user/index.vue index f54b6c4af..17c6102c7 100644 --- a/yudao-ui-app/pages/user/index.vue +++ b/yudao-ui-app/pages/user/index.vue @@ -97,7 +97,7 @@ @click="jumpPage('/pages/users/user_spread_code/index')"> - + @@ -257,9 +257,7 @@ }) }, callPhone() { - if(this.tenantInfo.serviceMobile){ - window.location.href = `tel:${this.tenantInfo.serviceMobile}` - } + window.location.href = `tel:4008009935` }, kefuClick() { if (this.tenantInfo.wxKfUrl) { diff --git a/yudao-ui-app/pages/users/user_spread_code/index.vue b/yudao-ui-app/pages/users/user_spread_code/index.vue index 7b50b6b69..a8950af26 100644 --- a/yudao-ui-app/pages/users/user_spread_code/index.vue +++ b/yudao-ui-app/pages/users/user_spread_code/index.vue @@ -81,12 +81,11 @@ mask: true }); that.isHideBtn = true - for(let i = 0; i<3; i++){ + for(let i = 0; i<2; i++){ await htmlToImage.toPng(document.getElementById('poster-wrap'), { quality: 0.95, cacheBust: true }); - console.log('i', i) } htmlToImage.toPng(document.getElementById('poster-wrap'), { quality: 0.95,