diff --git a/config/app.js b/config/app.js index a7a2179..d79079f 100644 --- a/config/app.js +++ b/config/app.js @@ -1,8 +1,8 @@ //移动端商城API // let domain = 'http://117.50.163.143:20410' // let domain = 'http://117.50.215.20:20410' -let domain = 'http://192.168.2.14:8081' -// let domain = 'http://106.75.49.247:20410' +// let domain = 'http://192.168.2.14:8081' +let domain = 'http://106.75.49.247:20410' module.exports = { // 请求域名 格式： https://您的域名 @@ -10,8 +10,9 @@ module.exports = { // HTTP_REQUEST_URL:'', HTTP_REQUEST_URL: domain, // H5商城地址 - // HTTP_H5_URL: 'http://106.75.49.247:20410', - HTTP_H5_URL: 'http://192.168.2.14:8081', + HTTP_H5_URL: 'http://106.75.49.247:20410', + // HTTP_H5_URL: 'http://192.168.2.14:8081', + // HTTP_H5_URL: 'http://117.50.215.20:20410', // #endif // #ifdef H5 HTTP_REQUEST_URL:domain, @@ -30,3 +31,4 @@ module.exports = { //分页最多显示条数 LIMIT: 10 }; + \ No newline at end of file diff --git a/manifest.json b/manifest.json index 0cd85f5..8ecc5b1 100644 --- a/manifest.json +++ b/manifest.json @@ -163,7 +163,7 @@ "quickapp" : {}, /* 小程序特有相关 */ "mp-weixin" : { - "appid" : "wx46c3a73d8c4f7051", + "appid" : "wx424c861adb20990f", "libVersion" : "latest", "setting" : { "urlCheck" : false, diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index 05533cf..7396ebb 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -770,11 +770,11 @@ transform: translateX(-50%); } .logoicon { - width: 100%; - height: 500rpx; + width: 80rpx; + height: 140rpx; z-index: 99; position: absolute; - top: 30%; + top: 38%; left: 50%; transform: translateX(-50%); } diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index 80fb6d8..1ece76d 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -59,8 +59,7 @@ - - + 完善身份信息   {{sfxx}} diff --git a/pages/users/order_improves/index.vue b/pages/users/order_improves/index.vue index b5bccf1..aa17a54 100644 --- a/pages/users/order_improves/index.vue +++ b/pages/users/order_improves/index.vue @@ -349,21 +349,7 @@ }); } }, - // 判断身份证 - // idcardinp() { - // let result = /^[1-9]\d{5}(18|19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}([0-9]|X)$/ - // if (this.idcard == '') { - // return this.$util.Tips({ - // title: '身份证不能为空' - // }); - // } else if (result.test(this.idcard)) { - - // } else { - // return this.$util.Tips({ - // title: '请填写正确的身份证' - // }); - // } - // }, + // 判断手机号 telinp() { let photopatten = /^1[3456789]\d{9}$/ @@ -407,20 +393,7 @@ }); } }, - // telinpthre() { - // let photopatten = /^1[3456789]\d{9}$/ - // if (this.telthre == '') { - // return this.$util.Tips({ - // title: '常用手机号不能为空' - // }); - // } else if (photopatten.test(this.telthre)) { - - // } else { - // return this.$util.Tips({ - // title: '请填写正确的手机号' - // }); - // } - // }, + // 点击显示联系人关系 openPopup(e) { this.$refs[e].open(); @@ -450,19 +423,6 @@ this.lxrmorenadd = val this.personflagb = false }, - // 判断邮箱 - // emitextinp() { - // let aqq = /^[A-Za-z0-9\u4e00-\u9fa5]+@[a-zA-Z0-9_-]+(\.[a-zA-Z0-9_-]+)+$/ - // if (this.emitext == '') { - // return this.$util.Tips({ - // title: '常用邮箱不能为空' - // }); - // } else if (!aqq.test(this.emitext)) { - // return this.$util.Tips({ - // title: '请填写正确的邮箱' - // }); - // } - // }, // 点击确定调用判断 btnclick() { @@ -650,7 +610,52 @@ - + uploadpic: function() { + let that = this; + that.$util.uploadImageOne({ + url: 'upload/image', + name: 'multipart', + model: 'user', + pid: 7 + }, function(res) { + that.upLoadPositiveImg = res.data.url; + // console.log(that.upLoadPositiveImg) + }); + }, + + uploadpics: function() { + let that = this; + that.$util.uploadImageOne({ + url: 'upload/image', + name: 'multipart', + model: 'user', + pid: 7 + }, function(res) { + that.upLoadReverseImg = res.data.url; + }); + }, + + + + + + + + + + + + + + + + + + + + + + // file文件转base64 // getImageBase64(blob) { // return new Promise((resolve, reject) => { @@ -677,31 +682,7 @@ // } // }) // }, - - uploadpic: function() { - let that = this; - that.$util.uploadImageOne({ - url: that.upLoadPositiveImg, - name: 'multipart', - model: 'user', - pid: 7 - }, function(res) { - that.upLoadPositiveImg = res.data.url; - console.log(that.upLoadPositiveImg) - }); - }, - uploadpics: function() { - let that = this; - that.$util.uploadImageOne({ - url: 'upload/image', - name: 'multipart', - model: 'user', - pid: 7 - }, function(res) { - // console.log(res) - that.upLoadReverseImg = res.data.url; - }); - }, + // 身份证反面上传 // uploadReverse() { diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue index 3b134a3..06581d8 100644 --- a/pages/users/order_list/index.vue +++ b/pages/users/order_list/index.vue @@ -509,11 +509,11 @@ } .logoicon { - width:100%; - height: 500rpx; + width: 80rpx; + height: 140rpx; z-index: 99; position: absolute; - top: 30%; + top: 38%; left: 50%; transform: translateX(-50%); } diff --git a/pages/users/pay_success/index.vue b/pages/users/pay_success/index.vue index e9d4b5f..e40b399 100644 --- a/pages/users/pay_success/index.vue +++ b/pages/users/pay_success/index.vue @@ -102,11 +102,11 @@ transform: translateX(-50%); } .logoicon { - width: 100%; - height: 500rpx; + width: 80rpx; + height: 140rpx; z-index: 99; position: absolute; - top: 25%; + top: 38%; left: 50%; transform: translateX(-50%); } diff --git a/pages/users/signin/index.vue b/pages/users/signin/index.vue index db11385..59d623b 100644 --- a/pages/users/signin/index.vue +++ b/pages/users/signin/index.vue @@ -111,11 +111,11 @@ transform: translateX(-50%); } .logoicon { - width: 100%; - height: 500rpx; + width: 80rpx; + height: 140rpx; z-index: 99; position: absolute; - top: 25%; + top: 38%; left: 50%; transform: translateX(-50%); } diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue index ce51e11..68a9a99 100644 --- a/pages/users/user_info/index.vue +++ b/pages/users/user_info/index.vue @@ -109,6 +109,7 @@ Debounce } from '@/utils/validate.js' import dayjs from "@/plugin/dayjs/dayjs.min.js"; +import { login } from '../../../api/public'; let app = getApp(); export default { data() { diff --git a/pages/users/wechat_login/index.vue b/pages/users/wechat_login/index.vue index 73616ca..4ceaaa4 100644 --- a/pages/users/wechat_login/index.vue +++ b/pages/users/wechat_login/index.vue @@ -101,7 +101,6 @@ atModel }, onLoad(options) { - //logo图片 getLogo().then(res => { this.logoUrl = res.data.logoUrl @@ -252,7 +251,6 @@ let userInfo = {}; userInfo.code = code; userInfo.spread_spid = app.globalData.spread; //获取推广人ID - userInfo.avatar = ''; userInfo.nickName = '微信用户'; userInfo.type = 'routine' @@ -268,7 +266,6 @@ let userInfo = res.userInfo; userInfo.code = code; userInfo.spread_spid = app.globalData.spread; //获取推广人ID - userInfo.avatar = userInfo.userInfo.avatarUrl; userInfo.city = userInfo.userInfo.city; userInfo.country = userInfo.userInfo.country; @@ -308,8 +305,6 @@ if (app.globalData.spread) { spread(app.globalData.spread).then(res => {}) //登录成功后读取spread绑定分销关系 } - - self.$util.Tips({ title: res, icon: 'success' diff --git a/static/img/live-logo.gif b/static/img/live-logo.gif deleted file mode 100644 index 1dfef3a..0000000 Binary files a/static/img/live-logo.gif and /dev/null differ