diff --git a/App.vue b/App.vue index 7e7d80e..363ccf6 100644 --- a/App.vue +++ b/App.vue @@ -160,8 +160,10 @@ export default { uni.$u.api.login.wechat({ code }).then(response => { const result = response.result || {}; this.$store.commit('SET_AUTHED', result.hasBind); - this.$store.commit('SET_USER_INFO', result); - uni.$emit('refresh-permission'); + if (result.hasBind) { + this.$store.commit('SET_USER_INFO', result); + uni.$emit('refresh-permission'); + } }); } }, diff --git a/common/api.js b/common/api.js index de29b28..3f88ae4 100644 --- a/common/api.js +++ b/common/api.js @@ -138,8 +138,8 @@ module.exports = (vm) => { getPayeeInfo: params => vm.$u.http.get( freightAPI + '/freightOrder/getPayeeInfo', params), // 获取收款人 modifyCustomerOrderCode: params => vm.$u.http.post( freightAPI + '/freightOrder/modifyCustomerOrderCode', params), // 修改内部单号 modifyAddress: params => vm.$u.http.get( freightAPI + '/freightOrder/modifyAddress', params), // 更改地址 - modifyGoods: params => vm.$u.http.post( freightAPI + '/freightOrder/modifyGoods', params), // 更改货物信息 - adjustAmount: params => vm.$u.http.post( freightAPI + '/freightOrder/adjustAmount', params), // 更改运费 + modifyGoods: params => vm.$u.http.post( freightAPI + '/freightOrder/maModifyGoods', params), // 更改货物信息 + adjustAmount: params => vm.$u.http.post( freightAPI + '/freightOrder/maAdjustAmount', params), // 更改运费 modifyReceiptAttachment: params => vm.$u.http.post( freightAdmin + '/woss/freightOrder/modifyReceiptAttachment', params), // 修改回单附件 count: params => vm.$u.http.post( freightAPI + '/freightOrder/count', params), // 状态数量 getDetail: params => vm.$u.http.get( freightAPI + '/freightOrder/getDetail', {params}), // 订单详情 diff --git a/config/index.js b/config/index.js index 3f74dfd..11b5c4b 100644 --- a/config/index.js +++ b/config/index.js @@ -29,28 +29,28 @@ const newUploadHost = `${envMapping[env] || envMapping.develop}/driver-app-api/u export default { // 微信小程序名称 wxAppName: '则一飞牛货主', - + // 微信小程序ID wxAppId: 'wxc92a99760d6b0a99', - + // 企业微信小程序SuiteID suiteId: '', - + // 钉钉第三方企业版小程序应用ID clientId: '', - + // 腾讯地图位置服务KEY(对应插件chooseLocation) mapServiceKey: 'CFKBZ-6L3C4-LZSUR-DJQAY-3R7NT-IPFJR', // 小程序的 Code Name - name: 'outscourced-ma', + name: 'freight-ma', // 全局分享文案 shareMessage: '则一飞牛货主', // 服务地址 apiHost, - + // 上传地址 uploadHost, @@ -62,4 +62,4 @@ export default { // 小程序版本（生产） version: miniProgram?.version, -} +}; diff --git a/main.js b/main.js index 60aabd2..4a0d672 100644 --- a/main.js +++ b/main.js @@ -18,16 +18,16 @@ uni.$u.setConfig({ 'u-primary': colorPrimary, }, }, - props: { + props: { line: { - color: 'rgba(151, 151, 151, 0.2)' + color: 'rgba(151, 151, 151, 0.2)', }, swiper: { - bgColor: 'inherit' + bgColor: 'inherit', }, - tabs: { + tabs: { lineColor: colorPrimary, - }, + }, steps: { activeColor: colorPrimary, }, @@ -44,18 +44,19 @@ uni.$u.setConfig({ activeColor: colorPrimary, }, input: { - fontSize: 'inherit' + fontSize: 'inherit', }, text: { size: 'inherit', - color: 'inherit' + color: 'inherit', }, icon: { - color: 'inherit' + color: 'inherit', }, - } + }, }); - +import mpShare from './uni_modules/uview-ui/libs/mixin/mpShare.js'; +Vue.mixin(mpShare); // 混入与组件List相关的页面生命周期 Vue.mixin({ onPullDownRefresh() { @@ -68,7 +69,7 @@ Vue.mixin({ onSearch(config) { if (this.mpType === 'page' && this.$refs.list) this.$refs.list.search(config); }, - } + }, }); // 页面内获取当前页面参数 @@ -79,7 +80,7 @@ Object.defineProperty(Vue.prototype, '$params', { }, }); -import store from './store' +import store from './store'; Vue.config.productionTip = false; Vue.prototype.$store = store; @@ -88,7 +89,7 @@ App.mpType = 'app'; const app = new Vue({ store, - ...App + ...App, }); require('@/utils/uniapp.js')(uni); diff --git a/pages/login/login.vue b/pages/login/login.vue index faa180c..da26b0a 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -4,8 +4,8 @@ - 您好， - 欢迎使用则一飞牛货主 + 欢迎使用 + 则一飞牛货主 @@ -40,7 +40,7 @@ - 手机号快捷登录 + 微信一键登录 @@ -202,6 +202,14 @@ export default { font-size: $font-lg * 1.2; padding: $padding-md; line-height: 2; + text-align: center; + color: $color-primary; + .welcome { + font-size: 40rpx; + } + .title { + font-size: 70rpx; + } } &__content { color: $color-minor; @@ -224,7 +232,7 @@ export default { background-color: $color-primary; padding: $padding-md; line-height: 1.5; - text-align: cener; + text-align: center; font-size: $font-md * 1.2; border-radius: $radius-lg * 2; &::after { @@ -245,7 +253,7 @@ export default { } } &__wechat { - color: $color-wx; + color: $color-primary; margin-top: $padding-md * 3; .u-icon { margin-right: $padding-base; diff --git a/pages/me/index.vue b/pages/me/index.vue index d41c6c5..6273b3b 100644 --- a/pages/me/index.vue +++ b/pages/me/index.vue @@ -1,64 +1,63 @@