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

盛安新版本问题优化-1

This commit is contained in:
曹磊 2024-10-26 16:43:55 +08:00
parent 77c8b132fc
commit b7f1640c6f
10 changed files with 55 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/config.js
View File

@ -39,6 +39,7 @@ const ROOTPATH1 = (checkdomain(ROOTHOST) ? "https://" : "http://") + ROOTHOST +
const ROOTPATH2 = "wss://" + ROOTHOST + "/wss/chatSocket/"; //联系客服 const ROOTPATH2 = "wss://" + ROOTHOST + "/wss/chatSocket/"; //联系客服
const WEBSOCKETADDRESS = "wss://" + ROOTHOST + "/wss/chatSocket/"; //退出软件后台后将用户状态置为离线 const WEBSOCKETADDRESS = "wss://" + ROOTHOST + "/wss/chatSocket/"; //退出软件后台后将用户状态置为离线
const UPLOAD_PATH = ROOTPATH1 + '/alioss/upload'; const UPLOAD_PATH = ROOTPATH1 + '/alioss/upload';
const UPLOAD_AVATAR = ROOTPATH1 + '/alioss/uploadAvatar';
// const ROOTPATH = "http://192.168.0.131:8187/sqx_fast"; // const ROOTPATH = "http://192.168.0.131:8187/sqx_fast";
// const ROOTPATH1 = "http://192.168.0.131:8187/sqx_fast"; // const ROOTPATH1 = "http://192.168.0.131:8187/sqx_fast";
@ -68,6 +69,7 @@ module.exports = {
APIHOST1: ROOTPATH1, APIHOST1: ROOTPATH1,
WSHOST: ROOTPATH2, WSHOST: ROOTPATH2,
UPLOAD_PATH, UPLOAD_PATH,
UPLOAD_AVATAR,
// WSHOST1: ROOTPATH3, // WSHOST1: ROOTPATH3,
TX_MAP_KEY, TX_MAP_KEY,
WS_BASE_PATH, WS_BASE_PATH,

10
components/h-timePicker/h-timePicker.vue
View File

@ -80,8 +80,9 @@ export default {
let eT = +this.cTime; let eT = +this.cTime;
if (sT <= eT) { if (sT <= eT) {
let h = date1.getHours() < sT ? sT : date1.getHours(); // let h = date1.getHours() < sT ? sT : date1.getHours();
h = h + parseInt(this.timeNum); // h = h + parseInt(this.timeNum);
let h = sT;
if (h > eT || this.sDayNum > 0) { if (h > eT || this.sDayNum > 0) {
this.sDayNum = this.sDayNum <= 0 ? parseInt(this.sDay) + 1 : parseInt(this.sDay); this.sDayNum = this.sDayNum <= 0 ? parseInt(this.sDay) + 1 : parseInt(this.sDay);
for (let i = sT; i <= eT; i++) { for (let i = sT; i <= eT; i++) {
@ -93,8 +94,9 @@ export default {
} }
} }
} else { } else {
let h = date1.getHours() < sT ? sT : date1.getHours(); // let h = date1.getHours() < sT ? sT : date1.getHours();
h = h + parseInt(this.timeNum); // h = h + parseInt(this.timeNum);
let h = sT;
if ((h > eT && h < sT) || h > 23 || this.sDayNum > 0) { if ((h > eT && h < sT) || h > 23 || this.sDayNum > 0) {
this.sDayNum = this.sDayNum <= 0 ? parseInt(this.sDay) + 1 : parseInt(this.sDay); this.sDayNum = this.sDayNum <= 0 ? parseInt(this.sDay) + 1 : parseInt(this.sDay);
for (let i = 0; i <= 23; i++) { for (let i = 0; i <= 23; i++) {

3
components/h-timePicker/h-timePickerEnd.vue
View File

@ -69,7 +69,7 @@ export default {
}, },
pickerTap: function() { pickerTap: function() {
let date = new Date(); let date = new Date();
date.setDate(date.getDate() + 1); //date.setDate(date.getDate() + 1);
let monthDay = []; let monthDay = [];
let hours = []; let hours = [];
let minute = []; let minute = [];
@ -202,7 +202,6 @@ export default {
} }
}, },
bindStartMultiPickerChange(e) { bindStartMultiPickerChange(e) {
console.log(e);
this.multiIndex = e.detail.value; this.multiIndex = e.detail.value;
let da = this.multiArray; let da = this.multiArray;
let di = e.detail.value; let di = e.detail.value;

39
my/renzheng/index.vue
View File

@ -49,10 +49,19 @@
</u-form-item> </u-form-item>
</u-form> </u-form>
</view> </view>
<view class=" padding bg radius margin" style="padding-top: 20rpx; margin-top: 20rpx;"> <view v-if="renzheng == 0 || renzheng == 3" class=" padding bg radius margin" style="padding-top: 20rpx; margin-top: 20rpx;">
<view class="margin-top-sm">请选择认证类型</view> <view class="margin-top-sm">请选择认证类型</view>
<view class="guke-list"> <view class="guke-list">
<view class="guke-btn huiBtn" :class="{ lanBtn: selected.includes(item) }" @click="gukeBtn(item)" <view class="guke-btn huiBtn" :class="{ lanBtn: selected.includes(item.id) }" @click="gukeBtn(item)"
v-for="(item,index) in typeList" :key="index">
{{item.value}}
</view>
</view>
</view>
<view v-else class=" padding bg radius margin" style="padding-top: 20rpx; margin-top: 20rpx;">
<view class="margin-top-sm">已认证类型</view>
<view class="guke-list">
<view class="guke-btn huiBtn" :class="{ lanBtn: selected.includes(item.id) }"
v-for="(item,index) in typeList" :key="index"> v-for="(item,index) in typeList" :key="index">
{{item.value}} {{item.value}}
</view> </view>
@ -136,8 +145,8 @@
</view> </view>
</view> </view>
</view> </view>
<jp-cropper-watermark :watermarkType="1" mode="ratio" :width="400" :height="500" :maxWidth="400" <jp-cropper-watermark :watermarkType="1" mode="ratio" :width="300" :height="500" :maxWidth="1080"
:maxHeight="500" :url="url" @cancel="oncancel" @ok="onok"></jp-cropper-watermark> :maxHeight="1920" :url="url" @cancel="oncancel" @ok="onok"></jp-cropper-watermark>
</view> </view>
<view class="margin-top-sm">持有资质证书（可多张）</view> <view class="margin-top-sm">持有资质证书（可多张）</view>
<view class="flex" style="overflow: hidden;flex-wrap: wrap;"> <view class="flex" style="overflow: hidden;flex-wrap: wrap;">
@ -397,15 +406,16 @@
return `${year}-${month}-${day}`; return `${year}-${month}-${day}`;
}, },
gukeBtn(item) { gukeBtn(item) {
var index = this.selected.indexOf(item); console.log(this.selected);
var index = this.selected.indexOf(item.id);
if (index === -1) { if (index === -1) {
this.selected.push(item); this.selected.push(item.id);
} else { } else {
this.selected.splice(index, 1); this.selected.splice(index, 1);
} }
var data = []; var data = [];
for (var i = 0; i < this.selected.length; i++) { for (var i = 0; i < this.selected.length; i++) {
data.push(this.selected[i].id) data.push(this.selected[i])
} }
this.typeId = data.join(",") this.typeId = data.join(",")
console.log("this.typeId", this.typeId) console.log("this.typeId", this.typeId)
@ -734,6 +744,13 @@
if (res.data.status == 2) { if (res.data.status == 2) {
this.form.remek = res.data.remek ? res.data.remek : '' this.form.remek = res.data.remek ? res.data.remek : ''
} }
if (res.data.classifyId) {
let classifyIds = res.data.classifyId.split(',');
for (let i = 0; i < classifyIds.length; i++) {
let id = classifyIds[i];
this.selected.push(Number(id));
}
}
} }
}); });
}, },
@ -803,24 +820,21 @@
onok(ev) { onok(ev) {
var that = this; var that = this;
this.url = ""; this.url = "";
// that.form.headImg = ev.path;
var url = null; var url = null;
if (ev.path) { if (ev.path) {
that.$queue.showLoading("上传中..."); that.$queue.showLoading("上传中...");
// 图片小于等于2MB // 图片小于等于2MB
that.urlUol = ev.path;
uni.uploadFile({ // 上传接口 uni.uploadFile({ // 上传接口
url: websocketUtils.uploadFileUrl(), //真实的接口地址 url: websocketUtils.uploadAvatarUrl(), //真实的接口地址
filePath: that.urlUol, filePath: that.urlUol,
name: 'file', name: 'file',
success: (uploadFileRes) => { success: (uploadFileRes) => {
that.form.headImg = JSON.parse(uploadFileRes.data).data that.form.headImg = JSON.parse(uploadFileRes.data).data
console.log(that.form.headImg)
uni.hideLoading(); uni.hideLoading();
} }
}); });
} }
console.log("asdasdasdasd", this.avatar)
}, },
oncancel() { oncancel() {
// url设置为空，隐藏控件 // url设置为空，隐藏控件
@ -1064,7 +1078,6 @@
} }
}, },
setPayment(name, order) { setPayment(name, order) {
console.log(777777777, name, order)
uni.requestPayment({ uni.requestPayment({
provider: name, provider: name,
orderInfo: order, //微信、支付宝订单数据 orderInfo: order, //微信、支付宝订单数据

4
pages/index/previousPoints.vue
View File

@ -79,8 +79,8 @@
<view class="mian-bottom"> <view class="mian-bottom">
<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.priceTotal}}</view> <view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.priceTotal}}</view>
<view class="mian-bottom-shou"> <view class="mian-bottom-shou">
<span class="shouyi-text">本单收益: </span> <span class="shouyi-text">本单积分: </span>
<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoneyTotal}}</span> <span class="shouyi-text" style="color: #FF6000;font-weight: bold;">{{item.jifen}}</span>
</view> </view>
</view> </view>
</view> </view>

2
pages/my/index.vue
View File

@ -23,7 +23,7 @@
<view class="flex align-center" style="font-size: 14px;"> <view class="flex align-center" style="font-size: 14px;">
<image src="../../static/images/my/start.png" <image src="../../static/images/my/start.png"
style="width: 13px;height: 12px;margin: 0 6rpx 0 20rpx;"></image> style="width: 13px;height: 12px;margin: 0 6rpx 0 20rpx;"></image>
5.0 {{ordersScore}}
</view> </view>
<view class="xyf" @click="goNav('/my/wallet/xinyongfendetail')">{{ creditScore }}</view> <view class="xyf" @click="goNav('/my/wallet/xinyongfendetail')">{{ creditScore }}</view>
</view> </view>

11
pages/my/mangshi.vue
View File

@ -6,7 +6,7 @@
<switch :checked='isTrue' style="transform:scale(0.7)" color="#029d88" @change="switch1Change"/> <switch :checked='isTrue' style="transform:scale(0.7)" color="#029d88" @change="switch1Change"/>
</view> </view>
<view class="selectTimt"> <view class="selectTimt">
<view class="dx_title">选择接单时问</view> <view class="dx_title">选择接单时间</view>
<view class="selectTimt-bottom"> <view class="selectTimt-bottom">
<hTimePicker class="selectTimt-time" dayNum='0' sTime="0" cTime="23" interval="30" @changeTime="bindTimeChange"> <hTimePicker class="selectTimt-time" dayNum='0' sTime="0" cTime="23" interval="30" @changeTime="bindTimeChange">
<view slot="pCon" class="changeTime"> <view slot="pCon" class="changeTime">
@ -18,7 +18,6 @@
<view slot="pCon" class="changeTime"> <view slot="pCon" class="changeTime">
<view class="selectTimt-time-title">结束时间</view> <view class="selectTimt-time-title">结束时间</view>
<view class="uni-input"> <view class="uni-input">
<span style="margin-right: 5px;">次日</span>
<span>{{endTime}}</span> <span>{{endTime}}</span>
</view> </view>
</view> </view>
@ -378,7 +377,7 @@
multiSelector: '', multiSelector: '',
isTrue: true, isTrue: true,
starTime:'00:00', starTime:'00:00',
endTime: '00:00', endTime: '23:59',
appointTime:[], appointTime:[],
disableTimeSlot:[], disableTimeSlot:[],
newmsList: [], newmsList: [],
@ -558,7 +557,11 @@
this.msList=time; this.msList=time;
}, },
sub() { sub() {
this.saveMangShi(); if(this.endTime>=this.starTime){
this.saveMangShi();
}else{
this.$queue.showToast('开始时间需早于结束时间！');
}
// if (this.msList.length == 0) { // if (this.msList.length == 0) {
// if(this.yearsDate === ''){ // if(this.yearsDate === ''){
// this.$queue.showToast('请先添加待选时间！'); // this.$queue.showToast('请先添加待选时间！');

7
pages/my/userinfo.vue
View File

@ -15,7 +15,7 @@
<!-- #endif --> <!-- #endif -->
<!-- #ifndef MP-WEIXIN --> <!-- #ifndef MP-WEIXIN -->
<view @click="toggle()"> <view @click="toggle()">
<jp-cropper-watermark :watermarkType="1" mode="ratio" :width="400" :height="500" :maxWidth="400" :maxHeight="500" :url="url" @cancel="oncancel" @ok="onok"></jp-cropper-watermark> <jp-cropper-watermark :watermarkType="1" mode="ratio" :width="300" :height="500" :maxWidth="1080" :maxHeight="1920" :url="url" @cancel="oncancel" @ok="onok"></jp-cropper-watermark>
<image src="../../static/logo.png" v-if="avatar==null" mode="" <image src="../../static/logo.png" v-if="avatar==null" mode=""
style="width: 111rpx;height: 111rpx;border-radius: 50%;"></image> style="width: 111rpx;height: 111rpx;border-radius: 50%;"></image>
<image v-else :src="avatar" mode="" style="width: 111rpx;height: 111rpx;border-radius: 50%;"> <image v-else :src="avatar" mode="" style="width: 111rpx;height: 111rpx;border-radius: 50%;">
@ -187,7 +187,7 @@
}); });
let userId = uni.getStorageSync('userId'); let userId = uni.getStorageSync('userId');
uni.uploadFile({ uni.uploadFile({
url: websocketUtils.uploadFileUrl(), //真实的接口地址 url: websocketUtils.uploadAvatarUrl(), //真实的接口地址
filePath: e.detail.avatarUrl, filePath: e.detail.avatarUrl,
header: { header: {
token: token token: token
@ -214,8 +214,9 @@
}); });
let token = uni.getStorageSync('token'); let token = uni.getStorageSync('token');
let userId = uni.getStorageSync('userId'); let userId = uni.getStorageSync('userId');
that.upUrl = ev.path;
uni.uploadFile({ uni.uploadFile({
url: websocketUtils.uploadFileUrl(), //真实的接口地址 url: websocketUtils.uploadAvatarUrl(), //真实的接口地址
filePath:that.upUrl, filePath:that.upUrl,
header: { header: {
token: token token: token

4
utils/websocketUtils.js
View File

@ -596,6 +596,10 @@ export function uploadFileUrl() {
return config('UPLOAD_PATH'); return config('UPLOAD_PATH');
} }
export function uploadAvatarUrl() {
return config('UPLOAD_AVATAR');
}
export function getWsBaseUrl() { export function getWsBaseUrl() {
return config('WSHOST'); return config('WSHOST');
} }

4
uview-ui/libs/request/index.js
View File

@ -101,9 +101,9 @@ class Request {
constructor() { constructor() {
this.config = { this.config = {
// baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换 baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换
// baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名 // baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名
baseUrl: 'https://sausers.blxinchuang.com', // 请求的根域名 // baseUrl: 'https://sausers.blxinchuang.com', // 请求的根域名
// 默认的请求头 // 默认的请求头
header: {}, header: {},
method: 'POST', method: 'POST',