diff --git a/App.vue b/App.vue index 51a92d2..8e22d32 100644 --- a/App.vue +++ b/App.vue @@ -724,7 +724,7 @@ export default { } if (userId && openid) { this.$Request.get('/app/Login/bindOpenId?userId=' + userId + '&openId=' + openid).then(res => { - // 盛安到家 + // 盛安小象 }); } } diff --git a/common/config.js b/common/config.js index c669e64..7a1adea 100644 --- a/common/config.js +++ b/common/config.js @@ -1,6 +1,8 @@ //生产环境 const PROT = "https://"//生产需替换 -const ROOTHOST = "admin.sjajk.com";//生产需替换 +// const ROOTHOST = "admin.sjajk.com";//生产需替换 +// const PROT = "http://" +const ROOTHOST = "192.168.2.22:8187"; //测试环境 diff --git a/components/wm-poster/wm-poster.vue b/components/wm-poster/wm-poster.vue index ce85100..4e0ae6d 100644 --- a/components/wm-poster/wm-poster.vue +++ b/components/wm-poster/wm-poster.vue @@ -29,7 +29,7 @@ Title: { //文本内容 Type: String, - default: '盛安到家' + default: '盛安小象' }, TitleColor: { //标题颜色 @@ -74,7 +74,7 @@ Referrer: { //推荐人信息 Type: String, - default: '盛安到家精选好物' + default: '盛安小象精选好物' }, ViewDetails: { //描述提示文字 diff --git a/components/wm-poster/wm-posters.vue b/components/wm-poster/wm-posters.vue index c8d9feb..8a86b12 100644 --- a/components/wm-poster/wm-posters.vue +++ b/components/wm-poster/wm-posters.vue @@ -24,7 +24,7 @@ }, Title: { //文本内容 Type: String, - default: '盛安到家' + default: '盛安小象' }, TitleColor: { //标题颜色 Type: String, @@ -60,7 +60,7 @@ }, Referrer: { //推荐人信息 Type: String, - default: '盛安到家精选好物' + default: '盛安小象精选好物' }, ViewDetails: { //描述提示文字 Type: String, diff --git a/manifest.json b/manifest.json index 53771ac..91f56a3 100644 --- a/manifest.json +++ b/manifest.json @@ -1,5 +1,5 @@ { - "name" : "盛安到家", + "name" : "盛安小象", "appid" : "__UNI__B37C795", "description" : "", "versionName" : "2.1.5", diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue index 0df5f23..0de2531 100644 --- a/my/order/revenueDetails.vue +++ b/my/order/revenueDetails.vue @@ -32,7 +32,8 @@ 已出发 已到达 待接单 - 拒单审核中 + + 拒单审核中 服务时长：-￥{{order.fxyArtificerDeductMoneyTotal}} + + 渠道商分佣 + -￥{{order.qdsArtificerDeductMoneyTotal}} + + + 业务员分佣 + -￥{{order.ywyArtificerDeductMoneyTotal}} + 技师收益 @@ -390,7 +401,8 @@ 已出发 已到达 待接单 - 拒单审核中 + + 拒单审核中 服务时长：￥{{order.addProjectBenefits!=null?order.addProjectBenefits:'-'}} - - 门店分佣 - -￥{{order.shopMoneyTotal}} - - - 经纪人分佣 - -￥{{order.jjrArtificerDeductMoneyTotal}} - - - 分销员分佣 - -￥{{order.fxyArtificerDeductMoneyTotal}} - + + 门店分佣 + -￥{{order.shopMoneyTotal}} + + + 经纪人分佣 + -￥{{order.jjrArtificerDeductMoneyTotal}} + + + 分销员分佣 + -￥{{order.fxyArtificerDeductMoneyTotal}} + + + 渠道商分佣 + -￥{{order.qdsArtificerDeductMoneyTotal}} + + + 业务员分佣 + -￥{{order.ywyArtificerDeductMoneyTotal}} + 技师收益 @@ -702,7 +724,8 @@ 已出发 已到达 待接单 - 拒单审核中 + + 拒单审核中 服务时长：车费收益 ￥{{order.artificerTaxiMoney}} - - 门店分佣 - -￥{{order.shopMoneyTotal}} - - - 经纪人分佣 - -￥{{order.jjrArtificerDeductMoneyTotal}} - - - 分销员分佣 - -￥{{order.fxyArtificerDeductMoneyTotal}} - + + 门店分佣 + -￥{{order.shopMoneyTotal}} + + + 经纪人分佣 + -￥{{order.jjrArtificerDeductMoneyTotal}} + + + 分销员分佣 + -￥{{order.fxyArtificerDeductMoneyTotal}} + + + 渠道商分佣 + -￥{{order.qdsArtificerDeductMoneyTotal}} + + + 业务员分佣 + -￥{{order.ywyArtificerDeductMoneyTotal}} + 技师收益 @@ -984,7 +1017,8 @@ 已出发 已到达 待接单 - 拒单审核中 + + 拒单审核中 服务时长：车费收益 ￥{{order.artificerTaxiMoney}} - - 门店分佣 - -￥{{order.shopMoneyTotal}} - - - 经纪人分佣 - -￥{{order.jjrArtificerDeductMoneyTotal}} - - - 分销员分佣 - -￥{{order.fxyArtificerDeductMoneyTotal}} - + + 门店分佣 + -￥{{order.shopMoneyTotal}} + + + 经纪人分佣 + -￥{{order.jjrArtificerDeductMoneyTotal}} + + + 分销员分佣 + -￥{{order.fxyArtificerDeductMoneyTotal}} + + + 渠道商分佣 + -￥{{order.qdsArtificerDeductMoneyTotal}} + + + 业务员分佣 + -￥{{order.ywyArtificerDeductMoneyTotal}} + 技师收益 @@ -1253,7 +1297,8 @@ 已出发 已到达 待接单 - 拒单审核中 + + 拒单审核中 服务时长：￥{{order.addArtificerMoney!=null?order.addArtificerMoney:0}} - - 门店分佣 - -￥{{order.shopMoneyTotal}} - - - 经纪人分佣 - -￥{{order.jjrArtificerDeductMoneyTotal}} - - - 分销员分佣 - -￥{{order.fxyArtificerDeductMoneyTotal}} - + + 门店分佣 + -￥{{order.shopMoneyTotal}} + + + 经纪人分佣 + -￥{{order.jjrArtificerDeductMoneyTotal}} + + + 分销员分佣 + -￥{{order.fxyArtificerDeductMoneyTotal}} + + + 渠道商分佣 + -￥{{order.qdsArtificerDeductMoneyTotal}} + + + 业务员分佣 + -￥{{order.ywyArtificerDeductMoneyTotal}} + 技师收益 @@ -1558,7 +1613,8 @@ 联系客服 - 联系客户 + 联系客户 @@ -1656,7 +1712,7 @@ - + @@ -1889,16 +1945,16 @@ }, methods: { //绑定虚拟号 - bindPhone(){ + bindPhone() { let that = this; - console.log('手机号是：',that.phone); - if(that.phone==null|| that.phone==''){ + console.log('手机号是：', that.phone); + if (that.phone == null || that.phone == '') { this.$queue.showToast('获取技师电话号码错误!'); return; } //调试时先写个假的 //this.phone = '13080011344' - if(that.middleNumber != null && that.middleNumber != ''){ + if (that.middleNumber != null && that.middleNumber != '') { //弹出提示框，告知号码 uni.showModal({ title: '提示', @@ -1917,12 +1973,12 @@ return; } this.$Request.get('/app/user/insertVirtualPhoneAxN?phone=' + that.phone).then(res => { - console.log('返回的全部数据：',res); + console.log('返回的全部数据：', res); if (res.code == 0) { - console.log('返回数据是：',res.data); + console.log('返回数据是：', res.data); that.middleNumber = res.data.middleNumber; - console.log('虚拟号是：',that.middleNumber); - if(res.data.result === '000000'){ + console.log('虚拟号是：', that.middleNumber); + if (res.data.result === '000000') { //弹出提示框，告知号码 uni.showModal({ title: '提示', @@ -2142,10 +2198,10 @@ if (res.confirm) { let data = { ordersId: e.ordersId, - accomplishLongitude: '125.430647', - accomplishLatitude: '43.880721', - // accomplishLongitude: that.longitude, - // accomplishLatitude: that.latitude, + // accomplishLongitude: '125.430647', + // accomplishLatitude: '43.880721', + accomplishLongitude: that.longitude, + accomplishLatitude: that.latitude, jsFwcn: that.checkbox2, jsPjtag: that.selectedString, jsTsbz: that.textareaTxt @@ -2167,7 +2223,7 @@ } else { uni.showToast({ icon: 'error', - title:resA.msg + title: resA.msg }) uni.hideLoading(); } @@ -2956,8 +3012,8 @@ font-weight: bold; font-size: 29rpx; color: #333333; - margin-left:4px; - line-height:70rpx; + margin-left: 4px; + line-height: 70rpx; } .fuwu, @@ -3018,7 +3074,7 @@ width: 55rpx; height: 55rpx; position: absolute; - right:30rpx; + right: 30rpx; } .popup-head span:nth-child(1) { @@ -3256,7 +3312,7 @@ background: #F3F3F3; border-radius: 14rpx; padding: 5px; - font-size:14px; + font-size: 14px; padding: 20rpx; color: #999; margin-top: 10rpx; @@ -3538,12 +3594,13 @@ border-bottom: 1px #e5e5e5 solid; margin: 30rpx 0; } - .progress-status-jd{ + + .progress-status-jd { color: #fff; - border-radius:30rpx 30rpx 30rpx 8rpx ; + border-radius: 30rpx 30rpx 30rpx 8rpx; padding: 0 14rpx; background-image: linear-gradient(-45deg, #ff8c01, #ff5600); font-size: 26rpx; line-height: 46rpx; } - + \ No newline at end of file diff --git a/my/publish/download.vue b/my/publish/download.vue index ac6e099..8063040 100644 --- a/my/publish/download.vue +++ b/my/publish/download.vue @@ -2,9 +2,9 @@ - 盛安到家APP + 盛安小象APP {{message}} - + diff --git a/my/setting/chat.vue b/my/setting/chat.vue index 55c08e4..51a4673 100644 --- a/my/setting/chat.vue +++ b/my/setting/chat.vue @@ -456,7 +456,7 @@ userHead: avatar, userName: userName, storeId: '0', - storeHead: '盛安到家', + storeHead: '盛安小象', storeName: '' } this.$Request.postJson('/app/chats/save', data).then(res => { diff --git a/my/setting/zhuxiao.vue b/my/setting/zhuxiao.vue index 4c528af..59d6fb3 100644 --- a/my/setting/zhuxiao.vue +++ b/my/setting/zhuxiao.vue @@ -28,15 +28,15 @@ - 您在盛安到家购买的物品将无法进行售后 + 您在盛安小象购买的物品将无法进行售后 - 您在盛安到家的账号信息及会员权益将会永久清除且无法恢复 + 您在盛安小象的账号信息及会员权益将会永久清除且无法恢复 - 您所绑定的手机号码3个月内将无法再次注册盛安到家 + 您所绑定的手机号码3个月内将无法再次注册盛安小象 diff --git a/package/pages/zysc/index/commoditydetail.vue b/package/pages/zysc/index/commoditydetail.vue index 6c3f931..12f648f 100644 --- a/package/pages/zysc/index/commoditydetail.vue +++ b/package/pages/zysc/index/commoditydetail.vue @@ -52,7 +52,7 @@ 店铺 - 盛安到家自营店铺 + 盛安小象自营店铺 @@ -62,7 +62,7 @@ 店铺 - 盛安到家自营店铺 + 盛安小象自营店铺 diff --git a/package/pages/zysc/index/index.vue b/package/pages/zysc/index/index.vue index a37f730..a294cc7 100644 --- a/package/pages/zysc/index/index.vue +++ b/package/pages/zysc/index/index.vue @@ -211,7 +211,7 @@ - 盛安到家自营店铺 + 盛安小象自营店铺 diff --git a/package/pages/zysc/my/rebateorder.vue b/package/pages/zysc/my/rebateorder.vue index 9485ef2..ca21489 100644 --- a/package/pages/zysc/my/rebateorder.vue +++ b/package/pages/zysc/my/rebateorder.vue @@ -34,7 +34,7 @@ {{item.goodsTitle}} - 店铺名称：盛安到家自营店铺 + 店铺名称：盛安小象自营店铺 实付款 ￥{{item.payMoney}} diff --git a/package/pages/zysc/my/teamorder.vue b/package/pages/zysc/my/teamorder.vue index 12cd37c..bb27f05 100644 --- a/package/pages/zysc/my/teamorder.vue +++ b/package/pages/zysc/my/teamorder.vue @@ -42,7 +42,7 @@ {{item.goodsTitle}} - 店铺名称：盛安到家自营店铺 + 店铺名称：盛安小象自营店铺 实付款 ￥{{item.payMoney}} 直属名称 {{item.lowerUserName}} diff --git a/pages.json b/pages.json index 44fc43e..78e98a8 100644 --- a/pages.json +++ b/pages.json @@ -950,7 +950,7 @@ "globalStyle": { "navigationBarTextStyle": "black", - "navigationBarTitleText": "盛安到家", + "navigationBarTitleText": "盛安小象", "navigationBarBackgroundColor": "#FFFFFF", "backgroundColor": "#ffffff" diff --git a/pages/index/index.vue b/pages/index/index.vue index 4f81ed0..3832762 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -999,7 +999,7 @@ export default { console.log(res, "监听推送"); }) uni.createPushMessage({ - title: "盛安到家", + title: "盛安小象", content: "你有新的订单，请注意查收！", sound: "system", success: (res) => { @@ -1026,7 +1026,7 @@ export default { // console.log("channels :" + JSON.stringify(p)); //返回数组 // }) // var info = plus.push.getClientInfo(); - //盛安到家app新订单提示音 + //盛安小象app新订单提示音 const innerAudioContext = uni.createInnerAudioContext(); innerAudioContext.autoplay = true; innerAudioContext.src = diff --git a/pages/poster/poster.vue b/pages/poster/poster.vue index 1509ad4..256c8d7 100644 --- a/pages/poster/poster.vue +++ b/pages/poster/poster.vue @@ -14,11 +14,11 @@ }, title:{ type: String, - default: '盛安到家' + default: '盛安小象' }, subTitle:{ type: String, - default: '盛安到家' + default: '盛安小象' }, content:{ type: String, diff --git a/pages/public/login.vue b/pages/public/login.vue index ee8921b..de85d65 100644 --- a/pages/public/login.vue +++ b/pages/public/login.vue @@ -40,7 +40,7 @@ - 欢迎登录盛安到家 + 欢迎登录盛安小象 @@ -53,7 +53,7 @@ src="../../static/images/gouxuan.png" style="width: 30upx;height: 30upx;"> 同意 diff --git a/static/images/weigouxuan.svg b/static/images/weigouxuan.svg new file mode 100644 index 0000000..25d253c --- /dev/null +++ b/static/images/weigouxuan.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/uni_modules/jp-cropper-watermark/components/jp-cropper-watermark/jp-cropper-watermark.vue b/uni_modules/jp-cropper-watermark/components/jp-cropper-watermark/jp-cropper-watermark.vue index 0c0acb0..791fc7d 100644 --- a/uni_modules/jp-cropper-watermark/components/jp-cropper-watermark/jp-cropper-watermark.vue +++ b/uni_modules/jp-cropper-watermark/components/jp-cropper-watermark/jp-cropper-watermark.vue @@ -356,7 +356,6 @@ export default { destWidth: mx.tw, destHeight: mx.th, success: (rst) => { - console.log(rst) var path = rst.tempFilePath; // #ifdef H5 var base64 = path;