yangjun
/
sadjv3_jishi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

剩余需求，此版本部分访问地址还是指向本地，下一版代码进行修改

This commit is contained in:
1378012178@qq.com 2025-02-28 16:01:27 +08:00
parent 08dcb3d940
commit bc4fa93a76
19 changed files with 172 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
App.vue
View File

@ -724,7 +724,7 @@ export default {
}
if (userId && openid) {
this.$Request.get('/app/Login/bindOpenId?userId=' + userId + '&openId=' + openid).then(res => {
// 盛安到家
// 盛安小象
});
}
}

4
common/config.js
View File

@ -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";
//测试环境

4
components/wm-poster/wm-poster.vue
View File

@ -29,7 +29,7 @@
Title: {
//文本内容
Type: String,
default: '盛安到家'
default: '盛安小象'
},
TitleColor: {
//标题颜色
@ -74,7 +74,7 @@
Referrer: {
//推荐人信息
Type: String,
default: '盛安到家精选好物'
default: '盛安小象精选好物'
},
ViewDetails: {
//描述提示文字

4
components/wm-poster/wm-posters.vue
View File

@ -24,7 +24,7 @@
},
Title: { //文本内容
Type: String,
default: '盛安到家'
default: '盛安小象'
},
TitleColor: { //标题颜色
Type: String,
@ -60,7 +60,7 @@
},
Referrer: { //推荐人信息
Type: String,
default: '盛安到家精选好物'
default: '盛安小象精选好物'
},
ViewDetails: { //描述提示文字
Type: String,

2
manifest.json
View File

@ -1,5 +1,5 @@
{
"name" : "盛安到家",
"name" : "盛安小象",
"appid" : "__UNI__B37C795",
"description" : "",
"versionName" : "2.1.5",

107
my/order/revenueDetails.vue
View File

@ -32,7 +32,8 @@
<view class="nav-btn" v-if="order.status ==7">已出发</view>
<view class="nav-btn" v-if="order.status ==8">已到达</view>
<view class="nav-btn" v-if="order.status == 9&&!order.refusalContent">待接单</view>
<view class="progress-status-jd" v-if="order.status == 9&&order.refusalContent">拒单审核中</view>
<view class="progress-status-jd" v-if="order.status == 9&&order.refusalContent">
拒单审核中</view>
</view>
<view class="mian-time" v-if="order && order.ordersMassageList">
<text class="title-font">服务时长：</text><text
@ -290,6 +291,16 @@
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.fxyArtificerDeductMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">渠道商分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.qdsArtificerDeductMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">业务员分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.ywyArtificerDeductMoneyTotal}}</span>
</view>
</view>
<view class="yiji">
<view class="yuji-title">技师收益</view>
@ -390,7 +401,8 @@
<view class="nav-btn" v-if="order.status ==7">已出发</view>
<view class="nav-btn" v-if="order.status ==8">已到达</view>
<view class="nav-btn" v-if="order.status == 9&&!order.refusalContent">待接单</view>
<view class="progress-status-jd" v-if="order.status == 9&&order.refusalContent">拒单审核中</view>
<view class="progress-status-jd" v-if="order.status == 9&&order.refusalContent">
拒单审核中</view>
</view>
<view class="mian-time" v-if="order && order.ordersMassageList">
<text class="title-font">服务时长：</text><text
@ -603,6 +615,16 @@
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.fxyArtificerDeductMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">渠道商分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.qdsArtificerDeductMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">业务员分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.ywyArtificerDeductMoneyTotal}}</span>
</view>
</view>
<view class="yiji">
<view class="yuji-title">技师收益</view>
@ -702,7 +724,8 @@
<view class="nav-btn" v-if="order.status ==7">已出发</view>
<view class="nav-btn" v-if="order.status ==8">已到达</view>
<view class="nav-btn" v-if="order.status == 9&&!order.refusalContent">待接单</view>
<view class="progress-status-jd" v-if="order.status == 9&&order.refusalContent">拒单审核中</view>
<view class="progress-status-jd" v-if="order.status == 9&&order.refusalContent">
拒单审核中</view>
</view>
<view class="mian-time" v-if="order && order.ordersMassageList">
<text class="title-font">服务时长：</text><text
@ -882,6 +905,16 @@
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.fxyArtificerDeductMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">渠道商分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.qdsArtificerDeductMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">业务员分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.ywyArtificerDeductMoneyTotal}}</span>
</view>
</view>
<view class="yiji">
<view class="yuji-title">技师收益</view>
@ -984,7 +1017,8 @@
<view class="nav-btn" v-if="order.status ==7">已出发</view>
<view class="nav-btn" v-if="order.status ==8">已到达</view>
<view class="nav-btn" v-if="order.status == 9&&!order.refusalContent">待接单</view>
<view class="progress-status-jd" v-if="order.status == 9&&order.refusalContent">拒单审核中</view>
<view class="progress-status-jd" v-if="order.status == 9&&order.refusalContent">
拒单审核中</view>
</view>
<view class="mian-time" v-if="order && order.ordersMassageList">
<text class="title-font">服务时长：</text><text
@ -1154,6 +1188,16 @@
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.fxyArtificerDeductMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">渠道商分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.qdsArtificerDeductMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">业务员分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.ywyArtificerDeductMoneyTotal}}</span>
</view>
</view>
<view class="yiji">
<view class="yuji-title">技师收益</view>
@ -1253,7 +1297,8 @@
<view class="nav-btn" v-if="order.status ==7">已出发</view>
<view class="nav-btn" v-if="order.status ==8">已到达</view>
<view class="nav-btn" v-if="order.status == 9&&!order.refusalContent">待接单</view>
<view class="progress-status-jd" v-if="order.status == 9&&order.refusalContent">拒单审核中</view>
<view class="progress-status-jd" v-if="order.status == 9&&order.refusalContent">
拒单审核中</view>
</view>
<view class="mian-time" v-if="order && order.ordersMassageList">
<text class="title-font">服务时长：</text><text
@ -1457,6 +1502,16 @@
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.fxyArtificerDeductMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">渠道商分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.qdsArtificerDeductMoneyTotal}}</span>
</view>
<view class="mian-view-list">
<span class="title-font">业务员分佣</span>
<span class="value-font"
style="font-weight: bold;color: #FF6000;">-￥{{order.ywyArtificerDeductMoneyTotal}}</span>
</view>
</view>
<view class="yiji">
<view class="yuji-title">技师收益</view>
@ -1558,7 +1613,8 @@
</view>
<!-- <view class="footers-btn footers-bor" @click="goMsg">联系客服11</view> -->
<view class="footers-btn footers-bor" @click="goChat">联系客服</view>
<view class="footers-btn footers-bor" @click="bindPhone" v-if="order.status==2||order.status==7||order.status==8">联系客户</view>
<view class="footers-btn footers-bor" @click="bindPhone"
v-if="order.status==2||order.status==7||order.status==8">联系客户</view>
<!-- <view class="dian" @click="toggle('bottom',order)" v-if="order.status == 6">...</view> -->
</view>
<view class="footers" v-if="order.refusalContent!=null&&order.status=='9'">
@ -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,9 +3594,10 @@
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;

4
my/publish/download.vue
View File

@ -2,9 +2,9 @@
<view style="background: #FFFFFF;">
<view style="text-align: center;">
<image style="width: 160upx;height: 160upx;margin-top: 200upx;border-radius:20upx;" src="/static/logo.png"></image>
<view style="font-size: 46upx;margin-top: 20upx;color: #333333;font-weight: 500;">盛安到家APP</view>
<view style="font-size: 46upx;margin-top: 20upx;color: #333333;font-weight: 500;">盛安小象APP</view>
<view style="font-size: 28upx;margin-top: 8upx;color: #333333;font-weight: 500;">{{message}}</view>
<button class="confirm-btn" style="background-image: linear-gradient(to right, #223845, #00a85b)" @click="taobaoLogin">下载盛安到家APP</button>
<button class="confirm-btn" style="background-image: linear-gradient(to right, #223845, #00a85b)" @click="taobaoLogin">下载盛安小象APP</button>
</view>
<view id="shareit" v-if="show_share" @tap="closeShare">
<image class="arrow" src="../../static/img/jiant.png"></image>

2
my/setting/chat.vue
View File

@ -456,7 +456,7 @@
userHead: avatar,
userName: userName,
storeId: '0',
storeHead: '盛安到家',
storeHead: '盛安小象',
storeName: ''
}
this.$Request.postJson('/app/chats/save', data).then(res => {

6
my/setting/zhuxiao.vue
View File

@ -28,15 +28,15 @@
</view>
<view class="title_item">
<view class="item_yuan"></view>
<view class="item_title">您在盛安到家购买的物品将无法进行售后</view>
<view class="item_title">您在盛安小象购买的物品将无法进行售后</view>
</view>
<view class="title_item">
<view class="item_yuan"></view>
<view class="item_title">您在盛安到家的账号信息及会员权益将会永久清除且无法恢复</view>
<view class="item_title">您在盛安小象的账号信息及会员权益将会永久清除且无法恢复</view>
</view>
<view class="title_item">
<view class="item_yuan"></view>
<view class="item_title" style="color: #f00;">您所绑定的手机号码3个月内将无法再次注册盛安到家</view>
<view class="item_title" style="color: #f00;">您所绑定的手机号码3个月内将无法再次注册盛安小象</view>
</view>
</view>

4
package/pages/zysc/index/commoditydetail.vue
View File

@ -52,7 +52,7 @@
<view style="margin-right:60upx ;margin-left: 20upx;">店铺</view>
<image style="height: 40upx;width:40upx;margin-top: 6px;margin-right: 4upx;"
src="https://renwu.xiansqx.com/img/20210813/f51eb872013a4681826d15cd9e641b5c.png"></image>
<view style="font-weight: bold;">盛安到家自营店铺</view>
<view style="font-weight: bold;">盛安小象自营店铺</view>
</view>
</view>
</view>
@ -62,7 +62,7 @@
<view style="margin-right:60upx ;margin-left: 20upx;">店铺</view>
<image style="height: 40upx;width:40upx;margin-top: 6px;margin-right: 4upx;"
src="https://renwu.xiansqx.com/img/20210813/f51eb872013a4681826d15cd9e641b5c.png"></image>
<view style="font-weight: bold;">盛安到家自营店铺</view>
<view style="font-weight: bold;">盛安小象自营店铺</view>
</view>
</view>

2
package/pages/zysc/index/index.vue
View File

@ -211,7 +211,7 @@
<image style="height: 30upx;width:30upx;margin-right: 4upx;"
src="https://renwu.xiansqx.com/img/20210813/78058c9a635e4822853306964fa02d09.png">
</image>
<view>盛安到家自营店铺</view>
<view>盛安小象自营店铺</view>
</view>

2
package/pages/zysc/my/rebateorder.vue
View File

@ -34,7 +34,7 @@
<image class="goods-img" :src='item.goodsImg'></image>
<view class="right">
<text class="title clamp">{{item.goodsTitle}}</text>
<text class="attr-box">店铺名称：盛安到家自营店铺</text>
<text class="attr-box">店铺名称：盛安小象自营店铺</text>
<text class="price" style="margin-top: 10upx;">实付款 ￥{{item.payMoney}}</text>
<!-- <text class="attr-box">团长提成 ￥{{item.commissionMoney}}</text> -->
</view>

2
package/pages/zysc/my/teamorder.vue
View File

@ -42,7 +42,7 @@
<image class="goods-img" :src='item.goodsImg'></image>
<view class="right">
<text class="title clamp">{{item.goodsTitle}}</text>
<text class="attr-box">店铺名称：盛安到家自营店铺</text>
<text class="attr-box">店铺名称：盛安小象自营店铺</text>
<text class="price">实付款 ￥{{item.payMoney}}</text>
<view v-if="moneyFrom === 1" style="display: flex;flex-direction: column;">
<text class="attr-box">直属名称 {{item.lowerUserName}}</text>

2
pages.json
View File

@ -950,7 +950,7 @@
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "盛安到家",
"navigationBarTitleText": "盛安小象",
"navigationBarBackgroundColor": "#FFFFFF",
"backgroundColor": "#ffffff"

4
pages/index/index.vue
View File

@ -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 =

4
pages/poster/poster.vue
View File

@ -14,11 +14,11 @@
},
title:{
type: String,
default: '盛安到家'
default: '盛安小象'
},
subTitle:{
type: String,
default: '盛安到家'
default: '盛安小象'
},
content:{
type: String,

4
pages/public/login.vue
View File

@ -40,7 +40,7 @@
<!-- #endif -->
<!-- #ifndef MP-WEIXIN -->
<view style="text-align: center;">
<view style="font-size: 40upx;margin-top: 32upx;color: #333333;margin-top: 100rpx;">欢迎登录盛安到家</view>
<view style="font-size: 40upx;margin-top: 32upx;color: #333333;margin-top: 100rpx;">欢迎登录盛安小象</view>
<image style="width: 300upx;height: 300upx;margin-top: 200upx;margin-bottom:100rpx;border-radius:20upx"
src="../../static/logo.png"></image>
<button v-if="weixinLogin" class="confirm-btn" @click="weixinLo">微信登录</button>
@ -53,7 +53,7 @@
src="../../static/images/gouxuan.png"
style="width: 30upx;height: 30upx;"></image>
<image v-else @tap="isShowAgree"
src="https://wap.quanmindaojia.com/file/uploadPath/2023/01/18/02d699f656ea68f69a67ff906c8f1af6.png"
src="../../static/images/weigouxuan.svg"
style="width: 30upx;height: 30upx;"></image>
<text style="margin-left: 10upx;margin-right: 0;" @tap="isShowAgree">同意</text>
<!-- 协议地址 -->

1
static/images/weigouxuan.svg Normal file
View File

@ -0,0 +1 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1740712856097" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2031" xmlns:xlink="http://www.w3.org/1999/xlink" width="100" height="100"><path d="M512 128C300.288 128 128 300.288 128 512s172.288 384 384 384 384-172.288 384-384-172.288-384-384-384m0-64a448 448 0 1 1 0 896A448 448 0 0 1 512 64z" fill="#C8CBCC" p-id="2032"></path></svg>
Side by Side

After

Width:  |  Height:  |  Size: 522 B

1
uni_modules/jp-cropper-watermark/components/jp-cropper-watermark/jp-cropper-watermark.vue
View File

@ -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;