Skip to content

XDJK
XDJK
Commit 6f3498d2 by liuquan
Options

合并分支 'feature.logistics.v3.2.3.20210423.liuquan' 到 'XDJK-master' 

Feature.logistics.v3.2.3.20210423.liuquan

查看合并请求 !11
parents 59adfe4d ab36d678
Showing with 410 additions and 131 deletions
packageA/chat/chat.js
......@@ -276,6 +276,7 @@ Page({
// | $$ | $$__/ $$| $$__/ $$| $$| $$| $$_____
// | $$ \$$ $$| $$ $$| $$| $$ \$$ \
// \$$ \$$$$$$ \$$$$$$$ \$$ \$$ \$$$$$$$
/**
* 判断授权
*/
......@@ -711,6 +712,7 @@ Page({
} else if (res.code == 1 && res.data.status == "2") {
that.setData({
payFlag: false,
payFlag1: false,
end_time: '已结束',
sendBtns: true,
status: true,
......
packageA/chat/chat.wxml
......@@ -391,7 +391,7 @@
<text class='send-report' wx:if='{{payFlag}}' data-src="123" bindtap='openReport'>发送报告</text>
<text class='send-report' wx:if='{{!payFlag}}' data-src="123" style=" background:#e5e6e8;">发送报告</text>
<text class='send-img' wx:if='{{payFlag}}' bindtap='createImageMessage'>发送图片</text>
<text class='send-img' wx:if='{{!payFlag}}' style=" background:#e5e6e8;">发送图片</text>
<text class='send-img' wx:if='{{!payFlag}}' style="background:#e5e6e8;">发送图片</text>
<text class='send-img' wx:if='{{orderId!=""&&orderId!=0}}' bindtap='chatLog'>聊天记录</text>
<!-- <text class='send-img' wx:if="{{serviceEvaluation}}" bindtap="estimateShow" >服务评价</text> -->
</view>
......
packageA/drugOrderDetail/drugOrderDetail.wxml
......@@ -8,21 +8,21 @@
<view class="top-text">预计1-3天送达，偏远地区除外</view>
</view>
<view class="logistics">
<view class="logistics-title" wx:if="{{item.status==2}}">等待发货</view>
<view class="logistics-title" wx:if="{{item.status==3}}">已发货</view>
<view class="logistics-title" wx:if="{{item.status==4}}">已签收</view>
<view class="logistics-text">
<view class="addressInfo">
<view class="address-icon">
<text class="cuIcon-location"></text>
</view>
<view>
<view class=""><text class="address_name">{{address.name}}</text><text
class="address_call">{{address.phone}}</text></view>
<view class="address_text">{{address.take_over+address.detail_address}}</view>
</view>
<view class="logistics-title" wx:if="{{item.status==2}}">等待发货</view>
<view class="logistics-title" wx:if="{{item.status==3}}">已发货</view>
<view class="logistics-title" wx:if="{{item.status==4}}">已签收</view>
<view class="logistics-text">
<view class="addressInfo">
<view class="address-icon">
<text class="cuIcon-location"></text>
</view>
<view>
<view class=""><text class="address_name">{{address.name}}</text><text
class="address_call">{{address.phone}}</text></view>
<view class="address_text">{{address.take_over+address.detail_address}}</view>
</view>
</view>
</view>
<!-- <view>
<text class="cuIcon-right lg text-gray logistics-right"></text>
</view> -->
......@@ -126,6 +126,6 @@
<!-- <view wx:if="{{item.status==2}}" bindtap="editAddress" data-ordernumber="{{item.ordernumber}}"
data-address="{{address}}">修改地址</view> -->
<view bindtap="goLogistics" data-status="{{item.status}}" data-img="{{item.drug_arr[0].picture}}"
data-src="/packageA/logistics/logistics" data-num="{{item.express_order}}" data-com="{{item.com}}" data-ordernumber="{{item.ordernumber}}">查看物流
data-src="/packageA/logistics/logistics" data-ordernumber="{{item.ordernumber}}">查看物流
</view>
</view>
\ No newline at end of file
packageA/logistics/logistics.js
......@@ -15,10 +15,11 @@ Page({
time2: '',
time3: '',
img: '',
status: '',
status: -1,//物流状态
sforderid:'',//物流单号
logistics: false,
mobileTail: '',
xdorderid: ''
ordernumber: '' //订单单号
},
/**
* 生命周期函数--监听页面加载
......@@ -27,20 +28,10 @@ Page({
let that = this
that.setData({
img: options.img,
status: options.status,
// address: JSON.parse(options.address)
})
this.getOrderAddress(options.ordernumber)
console.log("options", options)
var list = options.num.split(',')
var comlist = options.com.split(',')
that.setData({
xdorderid: options.ordernumber,
list: list,
orderid: list[0],
comlist: comlist,
com: util.isEmpty(comlist[0]) ? 'shunfeng' : comlist[0]
ordernumber: options.ordernumber,
})
this.getLogisticsInfo(options.ordernumber);
// this.getLogisticsInfo("20210422589380")
},
/**
* 生命周期函数--监听页面显示
......@@ -51,19 +42,19 @@ Page({
/**
* 获取最新的订单收货地址
*/
getOrderAddress(ordernumber) {
var that = this;
getLogisticsInfo(ordernumber) {
let that = this;
Service.getOrdersAddress({
ordernumber
}).then(res => {
console.log("res", res)
if (res.code == 200) {
console.log("res.data",res.data)
console.log("res.data", res.data)
that.setData({
address: res.data,
mobileTail: res.data.phone.substring(res.data.phone.length - 4),
})
that.getWl()
this.getLogisticsNumber(ordernumber);
} else {
wx.showToast({
title: res.msg,
......@@ -80,15 +71,51 @@ Page({
})
},
/**
* 通过订单单号获取物流单号
*/
getLogisticsNumber(ordernumber) {
let that = this;
Service.getLogisticsNumber({
ordernumber
}).then(res => {
console.log("res.data", res)
if (res.code == 200) {
if (res.data) {
that.setData({
status:res.data.status,
sforderid:res.data.sf_waybillno
})
}
that.getWl()
// that.setData({
// address: res.data,
// mobileTail: res.data.phone.substring(res.data.phone.length - 4),
// })
} else {
wx.showToast({
title: res.msg,
icon: 'success',
mask: true
})
}
}).catch(err => {
console.err("getLogisticsNumber", err)
wx.showToast({
title: err,
// icon: 'success',
mask: true
})
})
},
/**
* 获取物流路由
*/
getWl: function () {
var that = this
var data = {}
data.orderid = that.data.orderid;
let that = this
let data = {}
data.orderid = that.data.sforderid;
data.mobileTail = that.data.mobileTail;
data.xdorderid = that.data.xdorderid;
data.com = that.data.com;
data.xdorderid = that.data.ordernumber;
data.phone = that.data.mobileTail;
Service.logisticsInfo(data).then((res) => {
if (res.data) {
......@@ -103,18 +130,19 @@ Page({
}
})
},
getSf: function (e) {
var _this = this
_this.setData({
orderid: e.currentTarget.dataset.num
})
_this.getWl()
},
/**
* 复制单号
* @param {*} e
*/
getNum: function (e) {
wx.setClipboardData({
data: this.data.orderid,
data: this.data.sforderid,
success: function (res) {
wx.showToast({
title: '复制成功',
icon: 'success',
mask: true
})
}
})
},
......
packageA/logistics/logistics.wxml
<!--packageA/logistics/logistics.wxml-->
<answer id='answer'></answer>
<view class="pre" wx:if="{{orderid!='null' && list.length>1}}">
<view space='ensp'>因货品存放于不同仓库，您的订单拆分为{{list.length}}个包裹发货，运单号为:
<text bindtap="getSf" data-num="{{item}}" wx:for="{{list}}" wx:key="index">{{item}}{{list.length>index+1?'、':''}}</text>{{list.length>index+1?'':'，'}}
点击单号可查看物流状态。</view>
</view>
<view class="header">
<view class="title">
<view class="img">
<image src="{{img}}"></image>
</view>
<view class="marl">
<view class="dfh mt" wx:if="{{status==2}}">待发货</view>
<view class="dfh" wx:if="{{status==3}}">待收货</view>
<view class="dfh" wx:if="{{status==4}}">已完成</view>
<view class="dh" wx:if="{{orderid!='null' && orderid}}">
<text wx:if="{{com=='shunfeng'}}">顺丰速运</text>
：{{orderid}}
<view class="btn" bindtap="getNum" wx:if="{{orderid!='null' && orderid}}">复制</view>
<view class="dfh mt" wx:if="{{status==-1}}">待发货</view>
<view class="dfh" wx:if="{{status==0||status==1||status==6}}">待收货</view>
<view class="dfh" wx:if="{{status==2}}">已完成</view>
<view class="dfh" wx:if="{{status==3}}">已取消</view>
<view class="dfh" wx:if="{{status==4}}">已拒收</view>
<view class="dfh" wx:if="{{status==5}}">派件异常</view>
<view class="dh" wx:if="{{sforderid}}">
<text >顺丰速运</text>
：{{sforderid}}
<view class="btn" bindtap="getNum" wx:if="{{sforderid}}">复制</view>
</view>
<view class="mt" wx:if="{{orderid!='null' && orderid}}">
<!-- <text class="wuliuzx">物流咨询：</text>
<text class="wuliutel" bindtap="ddh">95338</text> -->
</view>
<view class="mt" wx:if="{{status==2}}">
<view class="mt" wx:if="{{!sforderid}}">
<text class="wuliuzx02">暂无运单信息</text>
</view>
</view>
......@@ -49,7 +47,7 @@
</view>
</view>
</block>
<view class="list" wx:if="{{orderid!='null' && orderid}}">
<view class="list" wx:if="{{orderid}}">
<image src="{{arr==''?'/images/yfh.png':'/images/yfh2.png'}}"></image>
<view class="list-zi">
<view class="ztsize" style="font-size:32rpx;">已发货</view>
......
packageA/logistics/logistics.wxss
......@@ -134,7 +134,7 @@ text{
.steps .list:first-child .list-zi::before{
position: absolute;
z-index: 100;
left: 0;
left:4rpx ;
top: 0;
margin-top: 30rpx;
content: "";
......
packageA/productOrder/productOrder.js
......@@ -110,7 +110,7 @@ Page({
that.data.requestStatus = true;
var data = {
page: page,
// unionid:'oHhp80QCN2WjClijvSyhkEFQcUwY',
// unionid:'oHhp80TKmeamBXcKWKjwM-NBrZ94',
unionid: wx.getStorageSync('data').unionid,
status: status
};
......
packageA/productOrder/productOrder.wxml
......@@ -59,7 +59,7 @@
data-address="{{item.address}}">修改地址</view> -->
<view class="ckwl" wx:if="{{item.status==2||item.status==3 || item.status==4}}" bindtap="goLogistics"
data-status="{{item.status}}" data-img="{{item.prescription[0].picture}}"
data-src="/packageA/logistics/logistics" data-num="{{item.express_order_new}}" data-com="{{item.com}}" data-ordernumber="{{item.ordernumber}}">
data-src="/packageA/logistics/logistics" data-ordernumber="{{item.ordernumber}}">
查看物流</view>
<view class="ljzf" wx:if="{{item.status==3}}" bindtap="confirmReceipt" data-num="{{item.ordernumber}}">确认收货
</view>
......
packageA/productOrderDetail/productOrderDetail.wxml
......@@ -154,13 +154,13 @@
<view>如果回复不及时，可拨打</view>
<view>客服电话：<text style="color:#2684FF;" bindtap="dial">400-1199-218</text> 进行咨询。</view>
</view>
<!-- <view class="bottom row"> -->
<view class="bottom row">
<!-- <view>查看医生推荐</view> -->
<!-- <view bindtap="viewRecipe" data-item="{{item}}">查看处方</view> -->
<!-- <view wx:if="{{item.status==2}}" bindtap="editAddress" data-ordernumber="{{item.ordernumber}}"
data-address="{{address}}">修改地址</view> -->
<!-- <view bindtap="goLogistics" data-status="{{item.status+1}}" data-img="{{item.drug_arr[0].picture}}"
data-src="/packageA/logistics/logistics" data-num="{{item.express_order}}" data-com="{{item.com}}"
<view bindtap="goLogistics" data-img="{{item.drug_arr[0].picture}}"
data-src="/packageA/logistics/logistics"
data-ordernumber="{{item.ordernumber}}">查看物流
</view> -->
<!-- </view> -->
\ No newline at end of file
</view>
</view>
\ No newline at end of file
packageB/myReport/myReport.js
......@@ -45,15 +45,15 @@ Page({
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
this.getReportList();
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
// /**
// * 页面上拉触底事件的处理函数
// */
// onReachBottom: function () {
},
// },
/**
* 量表续答
* @param {*} e
......@@ -181,6 +181,7 @@ Page({
isShow: true,
})
}
wx.stopPullDownRefresh();
})
},
/**
......
pages/chatNews/chatNews.js
......@@ -77,6 +77,10 @@ Page({
}
}, 500);
},
onTabItemTap(item) {
// tab 点击时执行
console.log("item",item)
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
......
pages/dati04/dati04.js
......@@ -29,6 +29,7 @@ Page({
hollander: "", //霍兰德职业倾向
pizibao: "", //匹兹堡
pizibao1: "", //社会支持评定
multipleChoice: '', //多选题
pizibao2: "", // 成人智残测查量表
ptime1: "22",
pminute1: "30",
......@@ -36,6 +37,7 @@ Page({
pminute2: "30",
ptime3: "08",
pminute3: "00",
nextFalg: {},
uploadData: '',
monitor: '', //1为监测
inquiry: '', //1二维码。2聊天页面心理体检
......@@ -63,12 +65,13 @@ Page({
if (otype && otype == 11) {
} else {
console.log('asasasas',yanzhengid, lb_descript.desc.record_id)
console.log('asasasas', yanzhengid, lb_descript.desc.record_id)
if (lb_descript.desc.record_id == -1) {
this.loadData();
} else if (yanzhengid == lb_descript.desc.record_id) {
if (len > 0) {
var item = swiper_arr[1][len];
var nextFalg = this.data.nextFalg;
// 处理最后一题的选择问题
if (swiper_arr[1].length == answer_swiper.answer.length) {
var last_len = swiper_arr[1].length - 1; // 最后一题序号
......@@ -79,16 +82,31 @@ Page({
if (ind_len == con_len[i]) {
this.setData({
active: i,
disab: false
disab: false,
nextFalg: nextFalg
})
}
// 惰性性攻击的动态评价
if (lb_descript.id[0] == 830 && (i == con_len.length - 1)) {
nextFalg[last_len] = true;
this.setData({
// active: i,
disab: false,
nextFalg: nextFalg
})
let ans = answer_swiper.answer[last_len];
let ansArr = ans.split('|');
for (let i = 0; i < ansArr.length; i++) {
item.check[ansArr[i]] = 1;
}
}
}
}
this.setData({
item: item,
current: len,
all: swiper_arr[1].length,
nextFalg: nextFalg,
})
} else {
console.log("loadData", 2);
......@@ -99,11 +117,8 @@ Page({
this.loadData();
}
}
},
loadData: function () {
console.log("loadData1111111111111")
var lb_swiper_con = wx.getStorageSync('lb_swiper_con');
var lb = lb_swiper_con[1];
var arr = [];
......@@ -116,8 +131,13 @@ Page({
answer: lb[j].quesion_answer.split(','),
score: lb[j].quesion_score.split(','),
zimu: an,
check: [],
type: lb[j].type,
}
obj.check.length = obj.answer.length;
for (let i = 0; i < obj.answer.length; i++) {
obj.check[i] = 0;
}
arr.push(obj)
}
var swiper_arr = [
......@@ -130,7 +150,6 @@ Page({
} else {
wx.setStorageSync('swiper_arr', swiper_arr);
}
var lb_swiper_con = wx.getStorageSync('lb_swiper_con');
var answerData = {
score: [],
......@@ -144,16 +163,21 @@ Page({
wx.setStorageSync("timeArr", timeArr);
// wx.removeStorageSync('lb_swiper_con')
var item = swiper_arr[1][0]
var nextFalg = {
0: false
}
this.setData({
all: arr.length,
current: 0,
item: item
item: item,
nextFalg: nextFalg
});
wx.setNavigationBarTitle({
title: swiper_arr[0].measure_name
});
},
selectData: function (e) {
console.log("e", e)
let that = this;
var qufentime = wx.getStorageSync('qufentime');
var lb_descript = wx.getStorageSync('lb_descript');
......@@ -161,11 +185,18 @@ Page({
// var lb_swiper_con = wx.getStorageSync('lb_swiper_con');
var swiper_arr = wx.getStorageSync('swiper_arr');
var answer_swiper = wx.getStorageSync('answer_swiper');
console.log("answer_swiper", answer_swiper)
let len = swiper_arr[1].length;
var record = e.currentTarget.dataset.record;
var index = e.currentTarget.dataset.index;
// var answer = e.currentTarget.dataset.answer;
var score = e.currentTarget.dataset.score;
var btnFlag = e.currentTarget.dataset.btnflag || 0; // 多选判断 0无多选 1 有多选
var nextFalg = this.data.nextFalg;
nextFalg[record] = true;
this.setData({
nextFalg: nextFalg
})
if (this.data.pizibao2) {
var swiper_arr_chen = wx.getStorageSync('swiper_arr_chen');
if (record == 1 && index == 0) {
......@@ -182,6 +213,40 @@ Page({
}
// 判断题长度
if (record < Number(len) - 1) {
// 多选判断
if (this.data.multipleChoice && (this.data.current == 8 || this.data.current == 9 || this.data.current == 10)) {
answer_swiper.answer[record] = answer_swiper.answer[record] || '';
answer_swiper.score[record] = answer_swiper.score[record] || '';
answer_swiper.score[record]
var xin_sc = answer_swiper.score[record].split("|");
var xin_an = answer_swiper.answer[record].toString().split("|");
let item = this.data.item;
let l_answer = xin_an.indexOf(index.toString());
console.log("l_answer", l_answer)
if (l_answer > -1) {
item.check[index] = 0;
xin_an.splice(l_answer, 1);
xin_sc.splice(l_answer, 1);
index = xin_an.join('|');
score = xin_sc.join('|');
index = index.replace(/^\|/, '');
score = score.replace(/^\|/, '');
} else {
console.log("l_answer", l_answer)
item.check[index] = 1;
xin_an.push(index);
index = xin_an.join('|');
// ==============
xin_sc.push(score);
score = xin_sc.join('|');
index = index.replace(/^\|/, '');
score = score.replace(/^\|/, '');
}
// }
this.setData({
item: item,
})
}
this.setData({
active: index,
// active: -1,
......@@ -196,11 +261,47 @@ Page({
answer_swiper.answer[record] = index;
}
wx.setStorageSync('answer_swiper', answer_swiper);
console.log("btnFlag", btnFlag)
if (btnFlag == 0) { // 无多选
setTimeout(function () {
// console.log(record, "record")
that.next1(record);
}, 200)
}
// that.next(record);
setTimeout(function () {
that.next(record);
}, 200)
} else if (record == Number(len) - 1) {
// 多选判断
if (this.data.multipleChoice && (this.data.current == 8 || this.data.current == 9 || this.data.current == 10)) {
answer_swiper.answer[record] = answer_swiper.answer[record] || '';
answer_swiper.score[record] = answer_swiper.score[record] || '';
answer_swiper.score[record]
var xin_sc = answer_swiper.score[record].split("|");
var xin_an = answer_swiper.answer[record].toString().split("|");
let item = this.data.item;
let l_answer = xin_an.indexOf(index.toString());
if (l_answer > -1) {
item.check[index] = 0;
xin_an.splice(l_answer, 1);
xin_sc.splice(l_answer, 1);
index = xin_an.join('|');
score = xin_sc.join('|');
index = index.replace(/^\|/, '');
score = score.replace(/^\|/, '');
} else {
item.check[index] = 1;
xin_an.push(index);
index = xin_an.join('|');
// ==============
xin_sc.push(score);
score = xin_sc.join('|');
index = index.replace(/^\|/, '');
score = score.replace(/^\|/, '');
}
// }
this.setData({
item: item,
})
}
this.setData({
active: index,
// active: -1,
......@@ -226,24 +327,62 @@ Page({
let len = swiper_arr[1].length;
var answer_swiper = wx.getStorageSync('answer_swiper');
var item = swiper_arr[1][record]
var nextFalg = this.data.nextFalg;
nextFalg[record] = true;
// 多选题 的数据状态
if (this.data.multipleChoice && (record == 8 || record == 9 || record == 10)) {
let ans = answer_swiper.answer[record];
let ansArr = ans.split('|');
for (let i = 0; i < ansArr.length; i++) {
item.check[ansArr[i]] = 1;
}
}
this.setData({
active: answer_swiper.answer[Number(record)],
current: record,
item: item,
nextFalg: nextFalg
})
}
},
next: function (n) {
console.log("next", n)
if (this.data.multipleChoice) {
n = n.currentTarget.dataset.cur;
}
var answer_swiper = wx.getStorageSync('answer_swiper');
if (answer_swiper.answer[n].length <= 0) {
wx.showToast({
title: '请选择',
icon: 'none',
duration: 1000
});
return;
}
var swiper_arr = wx.getStorageSync('swiper_arr');
let len = swiper_arr[1].length;
if (answer_swiper.answer[n].length <= 0) {
wx.showToast({
title: '请选择',
icon: 'none',
duration: 1000
});
return;
}
if (n < len) {
// this.nextAnimation();
var item = swiper_arr[1][n + 1]
var answer_swiper = wx.getStorageSync('answer_swiper');
var an_len = answer_swiper.answer ? answer_swiper.answer.length : -1;
if (an_len - n > 1) {
// 多选题 的数据状态
if (this.data.multipleChoice && (n + 1 == 8 || n + 1 == 9 || n + 1 == 10)) {
let ans = answer_swiper.answer[n + 1];
let ansArr = ans.split('|');
for (let i = 0; i < ansArr.length; i++) {
item.check[ansArr[i]] = 1;
}
}
this.setData({
active: answer_swiper.answer[n + 1],
// active: -1,
......@@ -269,6 +408,59 @@ Page({
}
},
next1: function (n) {
console.log("n", n)
if (this.data.multipleChoice) {
n = n;
}
var answer_swiper = wx.getStorageSync('answer_swiper');
if (answer_swiper.answer[n].length <= 0) {
wx.showToast({
title: '请选择',
icon: 'none',
duration: 1000
});
return;
}
var swiper_arr = wx.getStorageSync('swiper_arr');
let len = swiper_arr[1].length;
if (n < len) {
// this.nextAnimation();
var item = swiper_arr[1][n + 1]
var answer_swiper = wx.getStorageSync('answer_swiper');
var an_len = answer_swiper.answer ? answer_swiper.answer.length : -1;
if (an_len - n > 1) {
// 多选题 的数据状态
if (this.data.multipleChoice && (n + 1 == 8 || n + 1 == 9 || n + 1 == 10)) {
let ans = answer_swiper.answer[n + 1];
let ansArr = ans.split('|');
for (let i = 0; i < ansArr.length; i++) {
item.check[ansArr[i]] = 1;
}
}
this.setData({
active: answer_swiper.answer[n + 1],
// active: -1,
item: item,
all: len,
current: n + 1
})
} else {
this.setData({
active: -1,
item: item,
all: len,
current: n + 1
})
}
} else if (n == len) {
console.log('tijiao')
// this.tijiao();
} else {
console.log('meiyouti')
}
},
nextAnimation: function () {
var that = this;
var _thisWidth = Number(this.data.winW);
......@@ -346,7 +538,11 @@ Page({
var pizibao2 = false;
if (lb_descript.id[0] == 438) {
pizibao2 = true;
}
// 惰性性攻击的动态评价
var multipleChoice = false;
if (lb_descript.id[0] == 830) {
multipleChoice = true;
}
// 社会支持评定
var pizibao1 = false;
......@@ -372,6 +568,7 @@ Page({
pizibao1: pizibao1,
pizibao2: pizibao2,
hollander: hollander,
multipleChoice: multipleChoice
})
var swiper_arr = wx.getStorageSync('swiper_arr');
if (swiper_arr) {
......@@ -478,7 +675,6 @@ Page({
title: '您当前的网络不稳定，请检查网络重新提交。',
duration: 2000
})
that.setData({
flag: true
})
......@@ -488,7 +684,7 @@ Page({
// }, 7000)
wx.showLoading({
title: '上传中...',
mask:true
mask: true
})
wx.request({
method: 'POST',
......@@ -613,7 +809,7 @@ Page({
setTimeout(function () {
wx.removeStorageSync('tplbDetail')
wx.removeStorageSync('weiLb')
let roomService =wx.getStorageSync('roomService');
let roomService = wx.getStorageSync('roomService');
//判断是否从IM跳入
if (roomService) {
wx.reLaunch({
......@@ -707,7 +903,6 @@ Page({
ptime3: ""
})
}
}
},
piminute: function (e) {
......
pages/dati04/dati04.wxml
<view class="warp" style="height:{{winH}}px;">
<view class="con">
<!-- 霍兰德职业倾向 -->
<!-- 霍兰德职业倾向 -->
<text wx:if="{{hollander&&item.type=='1'}}">第一部分 兴趣倾向,你喜欢做下列事情吗？</text>
<text wx:if="{{hollander&&item.type=='2'}}">第二部分 个体经历,你擅长下列活动吗？</text>
<text wx:if="{{hollander&&item.type=='3'}}">第三部分 人格倾向</text>
......@@ -10,16 +10,41 @@
<text wx:else>{{item.con}}</text>
</view>
<block wx:for="{{item.answer}}" wx:for-item="itemName" wx:for-index="index1" wx:key="*this">
<view class=" answer {{active == index1?'s-active':''}}" hidden="{{(pizibao&& current+1==1)||(pizibao&& current+1==3)||(pizibao&& current+1==4) || (pizibao1&& current+1==10) || (pizibao1&& current+1==11)}}" bindtap='selectData' data-index="{{index1}}"
data-answer="{{itemName}}" data-score="{{item.score[index1]}}" data-record="{{current}}">
<text>{{itemName}}</text>
</view>
<!--社会支持评定 -->
<view class="shehui {{((pizibao1&& current+1==10) || (pizibao1&& current+1==11))?'show':'hid'}}">
<view class=" answer1 {{active == index1?'s-active':''}} " bindtap='selectData' data-index="{{index1}}" data-answer="{{itemName}}" data-score="{{item.score[index1]}}" data-record="{{current}}" style="border-left:{{index1%2==0?'none':'0.5px solid #e3e3e3'}};">
<block wx:if="{{!multipleChoice}}">
<view class=" answer {{active == index1?'s-active':''}}"
hidden="{{(pizibao&& current+1==1)||(pizibao&& current+1==3)||(pizibao&& current+1==4) || (pizibao1&& current+1==10) || (pizibao1&& current+1==11)}}"
bindtap='selectData' data-index="{{index1}}" data-answer="{{itemName}}" data-score="{{item.score[index1]}}"
data-record="{{current}}">
<text>{{itemName}}</text>
</view>
</view>
<!--社会支持评定 -->
<view class="shehui {{((pizibao1&& current+1==10) || (pizibao1&& current+1==11))?'show':'hid'}}">
<view class=" answer1 {{active == index1?'s-active':''}} " bindtap='selectData' data-index="{{index1}}"
data-answer="{{itemName}}" data-score="{{item.score[index1]}}" data-record="{{current}}"
style="border-left:{{index1%2==0?'none':'0.5px solid #e3e3e3'}};">
<text>{{itemName}}</text>
</view>
</view>
</block>
<!-- 惰性性攻击的动态评价 -->
<block wx:else>
<block wx:if='{{current == 8 || current == 9 || current == 10}}'>
<view class=" answer {{item.check[index1] == 1?'s-active':''}}"
hidden="{{(pizibao&& current+1==1)||(pizibao&& current+1==3)||(pizibao&& current+1==4) ||(pizibao1&& current+1==56)||(pizibao1&& current+1==58)||(pizibao1&& current+1==59)|| (shzcpd&& current+1==10) || (shzcpd&& current+1==11)}}"
data-index="{{index1}}" data-answer="{{itemName}}" data-score="{{item.score[index1]}}"
data-record="{{current}}" bindtap='selectData' data-btnflag='1'>
<text>{{itemName}}</text>
</view>
</block>
<block wx:else>
<view class=" answer {{active == index1?'s-active':''}}"
hidden="{{(pizibao&& current+1==1)||(pizibao&& current+1==3)||(pizibao&& current+1==4) || (pizibao1&& current+1==56)||(pizibao1&& current+1==58)||(pizibao1&& current+1==59)||(shzcpd&& current+1==10) || (shzcpd&& current+1==11)}}"
data-index="{{index1}}" data-answer="{{itemName}}" data-score="{{item.score[index1]}}"
data-record="{{current}}" bindtap='selectData' data-btnflag='0'>
<text>{{itemName}}</text>
</view>
</block>
</block>
</block>
<!--匹兹堡睡眠质量 -->
<view class="pizibao {{(pizibao&& current+1==1)||(pizibao&& current+1==3)||(pizibao&& current+1==4)?'show':'hid'}}">
......@@ -58,15 +83,33 @@
</block>
</view>
</view>
<view class="btn {{current<all-1?'show':'hid'}}">
<view class="menuebtn1 {{current>0?'menuebtn-active':''}}" bindtap='prev'>上一题</view>
</view>
<view class="btn {{all==current+1?'show':'hid'}}">
<view class="menuebtn {{current>0?'menuebtn-active':''}}" bindtap='prev'>上一题</view>
<view class="menuebtn {{disab?'show':'hid'}} " style='margin-left:40rpx;'>提交</view>
<view class="menuebtn menuebtn-active {{disab?'hid':'show'}} " style='margin-left:40rpx;' wx:if='{{sc}}' bindtap='tijiao'>提交</view>
<view class="menuebtn menuebtn-active {{disab?'hid':'show'}} " style='margin-left:40rpx; background: #999;' wx:if='{{!sc}}'>上传中</view>
</view>
<block wx:if='{{!multipleChoice}}'>
<view class="btn {{current<all-1?'show':'hid'}}">
<view class="menuebtn1 {{current>0?'menuebtn-active':''}}" bindtap='prev'>上一题</view>
</view>
<view class="btn {{all==current+1?'show':'hid'}}">
<view class="menuebtn {{current>0?'menuebtn-active':''}}" bindtap='prev'>上一题</view>
<view class="menuebtn {{disab?'show':'hid'}} " style='margin-left:40rpx;'>提交</view>
<view class="menuebtn menuebtn-active {{disab?'hid':'show'}} " style='margin-left:40rpx;' wx:if='{{sc}}'
bindtap='tijiao'>提交</view>
<view class="menuebtn menuebtn-active {{disab?'hid':'show'}} " style='margin-left:40rpx; background: #999;'
wx:if='{{!sc}}'>上传中</view>
</view>
</block>
<block wx:else>
<view class="btn {{current<all?'show':'hid'}}">
<view wx:if="{{!canvas}}" class="menuebtn {{current>0?'menuebtn-active':''}}" bindtap='prev'>上一题</view>
<view class="menuebtn" wx:if='{{!nextFalg[current]}}' style='margin-left:40rpx;' data-cur='{{current}}'>
下一题</view>
<view class="menuebtn menuebtn-active" wx:elif='{{nextFalg[current] && current+1 < all }}'
style='margin-left:40rpx;' bindtap='next' data-cur='{{current}}'>下一题</view>
<block wx:else>
<view class="menuebtn {{disab?'show':'hid'}} " style='margin-left:40rpx;'>提交</view>
<view class="menuebtn menuebtn-active {{disab?'hid':'show'}} " style='margin-left:40rpx;' bindtap='tijiao'>提交
</view>
</block>
</view>
</block>
<view class='all-item'>
<text>{{current+1}}/{{all}}</text>
</view>
\ No newline at end of file
pages/index/index.js
......@@ -68,6 +68,7 @@ Page({
}
},
onPullDownRefresh: function () {
console.log("onPullDownRefresh")
var that = this
that.getDoctorIndex();
that.resultNot(that.data.userInfo.openid)
......
pages/my/my.js
......@@ -6,7 +6,7 @@ Page({
reportRedD: false, //报告红点展示
reportRedNum: 0, //未作报告数量
disabled: true, //防止重复点击
version: '3.2.0',
version: '3.2.2',
isShow: false,
showClose: true,
},
......
project.config.json
......@@ -37,7 +37,7 @@
"minifyWXSS": true
},
"compileType": "miniprogram",
"libVersion": "2.12.2",
"libVersion": "2.13.0",
"appid": "wxd418ee346d79d382",
"projectname": "XDJK-master",
"scripts": {
......
utils/city.js
var cityArray=[{ "name": "热门城市", "child": [{ "name": "全国" }, { "name": "北京" }, { "name": "上海" }, { "name": "广州" }, { "name": "杭州" }, { "name": "成都" }, { "name": "四川" }, { "name": "西安" }, { "name": "武汉" }] }, { "name": "北京", "child": [{ "name": "北京" }, { "name": "东城区" }, { "name": "西城区" }, { "name": "崇文区" }, { "name": "宣武区" }, { "name": "朝阳区" }, { "name": "丰台区" }, { "name": "石景山区" }, { "name": "海淀区" }, { "name": "门头沟区" }, { "name": "房山区" }, { "name": "通州区" }, { "name": "顺义区" }, { "name": "昌平区" }, { "name": "大兴区" }, { "name": "平谷区" }, { "name": "怀柔区" }, { "name": "密云县" }, { "name": "延庆县" }] }, { "name": "天津", "child": [{ "name": "天津" }, { "name": "和平区" }, { "name": "河东区" }, { "name": "河西区" }, { "name": "南开区" }, { "name": "河北区" }, { "name": "红桥区" }, { "name": "塘沽区" }, { "name": "汉沽区" }, { "name": "大港区" }, { "name": "东丽区" }, { "name": "西青区" }, { "name": "津南区" }, { "name": "北辰区" }, { "name": "武清区" }, { "name": "宝坻区" }, { "name": "宁河县" }, { "name": "静海县" }, { "name": "蓟 县" }] }, { "name": "河北", "child": [{ "name": "河北" }, { "name": "石家庄" }, { "name": "唐山" }, { "name": "秦皇岛" }, { "name": "邯郸" }, { "name": "邢台" }, { "name": "保定" }, { "name": "张家口" }, { "name": "承德" }, { "name": "沧州" }, { "name": "廊坊" }, { "name": "衡水" }] }, { "name": "山西", "child": [{ "name": "山西" }, { "name": "太原" }, { "name": "大同" }, { "name": "阳泉" }, { "name": "长治" }, { "name": "晋城" }, { "name": "朔州" }, { "name": "忻州" }, { "name": "吕梁" }, { "name": "晋中" }, { "name": "临汾" }, { "name": "运城" }] }, { "name": "内蒙古", "child": [{ "name": "内蒙古" }, { "name": "呼和浩特" }, { "name": "包头" }, { "name": "乌海" }, { "name": "赤峰" }, { "name": "呼伦贝尔" }, { "name": "兴安盟" }, { "name": "通辽" }, { "name": "锡林郭勒盟" }, { "name": "乌兰察布盟" }, { "name": "伊克昭盟" }, { "name": "巴彦淖尔盟" }, { "name": "阿拉善盟" }] }, { "name": "辽宁", "child": [{ "name": "辽宁" }, { "name": "沈阳" }, { "name": "大连" }, { "name": "鞍山" }, { "name": "抚顺" }, { "name": "本溪" }, { "name": "丹东" }, { "name": "锦州" }, { "name": "营口" }, { "name": "阜新" }, { "name": "辽阳" }, { "name": "盘锦" }, { "name": "铁岭" }, { "name": "朝阳" }, { "name": "葫芦岛" }] }, { "name": "吉林", "child": [{ "name": "吉林" }, { "name": "长春" }, { "name": "吉林" }, { "name": "四平" }, { "name": "辽源" }, { "name": "通化" }, { "name": "白山" }, { "name": "松原" }, { "name": "白城" }, { "name": "延边朝鲜族自治州" }] }, { "name": "黑龙江", "child": [{ "name": "黑龙江" }, { "name": "哈尔滨" }, { "name": "齐齐哈尔" }, { "name": "鹤岗" }, { "name": "双鸭山" }, { "name": "鸡西" }, { "name": "大庆" }, { "name": "伊春" }, { "name": "牡丹江" }, { "name": "佳木斯" }, { "name": "七台河" }, { "name": "黑河" }, { "name": "绥化" }, { "name": "大兴安岭地区" }] }, { "name": "上海", "child": [{ "name": "上海" }, { "name": "黄浦区" }, { "name": "卢湾区" }, { "name": "徐汇区" }, { "name": "长宁区" }, { "name": "静安区" }, { "name": "普陀区" }, { "name": "闸北区" }, { "name": "虹口区" }, { "name": "杨浦区" }, { "name": "宝山区" }, { "name": "闵行区" }, { "name": "嘉定区" }, { "name": "松江区" }, { "name": "金山区" }, { "name": "青浦区" }, { "name": "南汇区" }, { "name": "奉贤区" }, { "name": "浦东新区" }, { "name": "崇明县" }] }, { "name": "江苏", "child": [{ "name": "江苏" }, { "name": "南京" }, { "name": "苏州" }, { "name": "无锡" }, { "name": "常州" }, { "name": "镇江" }, { "name": "南通" }, { "name": "泰州" }, { "name": "扬州" }, { "name": "盐城" }, { "name": "连云港" }, { "name": "徐州" }, { "name": "淮安" }, { "name": "宿迁" }] }, { "name": "浙江", "child": [{ "name": "浙江" }, { "name": "杭州" }, { "name": "宁波" }, { "name": "温州" }, { "name": "嘉兴" }, { "name": "湖州" }, { "name": "绍兴" }, { "name": "金华" }, { "name": "衢州" }, { "name": "舟山" }, { "name": "台州" }, { "name": "丽水" }] }, { "name": "安徽", "child": [{ "name": "安徽" }, { "name": "合肥" }, { "name": "芜湖" }, { "name": "蚌埠" }, { "name": "淮南" }, { "name": "马鞍山" }, { "name": "淮北" }, { "name": "铜陵" }, { "name": "安庆" }, { "name": "黄山" }, { "name": "滁州" }, { "name": "阜阳" }, { "name": "宿州" }, { "name": "巢湖" }, { "name": "六安" }, { "name": "亳州" }, { "name": "池州" }, { "name": "宣城" }] }, { "name": "福建", "child": [{ "name": "福建" }, { "name": "福州" }, { "name": "厦门" }, { "name": "莆田" }, { "name": "三明" }, { "name": "泉州" }, { "name": "漳州" }, { "name": "南平" }, { "name": "龙岩" }, { "name": "宁德" }] }, { "name": "江西", "child": [{ "name": "江西" }, { "name": "南昌" }, { "name": "景德镇" }, { "name": "萍乡" }, { "name": "九江" }, { "name": "新余" }, { "name": "鹰潭" }, { "name": "赣州" }, { "name": "吉安" }, { "name": "宜春" }, { "name": "抚州" }, { "name": "上饶" }] }, { "name": "山东", "child": [{ "name": "山东" }, { "name": "济南" }, { "name": "青岛" }, { "name": "淄博" }, { "name": "枣庄" }, { "name": "东营" }, { "name": "烟台" }, { "name": "潍坊" }, { "name": "济宁" }, { "name": "泰安" }, { "name": "威海" }, { "name": "日照" }, { "name": "莱芜" }, { "name": "临沂" }, { "name": "德州" }, { "name": "聊城" }, { "name": "滨州" }, { "name": "菏泽" }] }, { "name": "河南", "child": [{ "name": "河南" }, { "name": "郑州" }, { "name": "开封" }, { "name": "洛阳" }, { "name": "平顶山" }, { "name": "安阳" }, { "name": "鹤壁" }, { "name": "新乡" }, { "name": "焦作" }, { "name": "濮阳" }, { "name": "许昌" }, { "name": "漯河" }, { "name": "三门峡" }, { "name": "南阳" }, { "name": "商丘" }, { "name": "信阳" }, { "name": "周口" }, { "name": "驻马店" }, { "name": "焦作" }] }, { "name": "湖北", "child": [{ "name": "湖北" }, { "name": "武汉" }, { "name": "黄石" }, { "name": "十堰" }, { "name": "荆州" }, { "name": "宜昌" }, { "name": "襄樊" }, { "name": "鄂州" }, { "name": "荆门" }, { "name": "孝感" }, { "name": "黄冈" }, { "name": "咸宁" }, { "name": "随州" }, { "name": "恩施土家族苗族自治州" }, { "name": "仙桃" }, { "name": "天门" }, { "name": "潜江" }, { "name": "神农架林区" }] }, { "name": "湖南", "child": [{ "name": "湖南" }, { "name": "长沙" }, { "name": "株洲" }, { "name": "湘潭" }, { "name": "衡阳" }, { "name": "邵阳" }, { "name": "岳阳" }, { "name": "常德" }, { "name": "张家界" }, { "name": "益阳" }, { "name": "郴州" }, { "name": "永州" }, { "name": "怀化" }, { "name": "娄底" }, { "name": "湘西土家族苗族自治州" }] }, { "name": "广东", "child": [{ "name": "广东" }, { "name": "广州" }, { "name": "深圳" }, { "name": "东莞" }, { "name": "中山" }, { "name": "潮州" }, { "name": "揭阳" }, { "name": "云浮" }, { "name": "珠海" }, { "name": "汕头" }, { "name": "韶关" }, { "name": "佛山" }, { "name": "江门" }, { "name": "湛江" }, { "name": "茂名" }, { "name": "肇庆" }, { "name": "惠州" }, { "name": "梅州" }, { "name": "汕尾" }, { "name": "河源" }, { "name": "阳江" }, { "name": "清远" }] }, { "name": "广西", "child": [{ "name": "广西" }, { "name": "南宁" }, { "name": "柳州" }, { "name": "桂林" }, { "name": "梧州" }, { "name": "北海" }, { "name": "防城港" }, { "name": "钦州" }, { "name": "贵港" }, { "name": "玉林" }, { "name": "百色" }, { "name": "贺州" }, { "name": "河池" }, { "name": "来宾" }, { "name": "崇左" }] }, { "name": "海南", "child": [{ "name": "海南" }, { "name": "海口" }, { "name": "三亚" }, { "name": "五指山" }, { "name": "琼海" }, { "name": "儋州" }, { "name": "文昌" }, { "name": "万宁" }, { "name": "东方" }, { "name": "澄迈县" }, { "name": "定安县" }, { "name": "屯昌县" }, { "name": "临高县" }, { "name": "白沙黎族自治县" }, { "name": "昌江黎族自治县" }, { "name": "乐东黎族自治县" }, { "name": "陵水黎族自治县" }, { "name": "保亭黎族苗族自治县" }, { "name": "琼中黎族苗族自治县" }] }, { "name": "重庆", "child": [{ "name": "重庆" }, { "name": "渝中区" }, { "name": "大渡口区" }, { "name": "江北区" }, { "name": "南岸区" }, { "name": "北碚区" }, { "name": "渝北区" }, { "name": "巴南区" }, { "name": "长寿区" }, { "name": "双桥区" }, { "name": "沙坪坝区" }, { "name": "万盛区" }, { "name": "万州区" }, { "name": "涪陵区" }, { "name": "黔江区" }, { "name": "永川区" }, { "name": "合川区" }, { "name": "江津区" }, { "name": "九龙坡区" }, { "name": "南川区" }, { "name": "綦江县" }, { "name": "潼南县" }, { "name": "荣昌县" }, { "name": "璧山县" }, { "name": "大足县" }, { "name": "铜梁县" }, { "name": "梁平县" }, { "name": "开县" }, { "name": "忠县" }, { "name": "城口县" }, { "name": "垫江县" }, { "name": "武隆县" }, { "name": "丰都县" }, { "name": "奉节县" }, { "name": "云阳县" }, { "name": "巫溪县" }, { "name": "巫山县" }, { "name": "石柱土家族自治县" }, { "name": "秀山土家族苗族自治县" }, { "name": "酉阳土家族苗族自治县" }, { "name": "彭水苗族土家族自治县" }] }, { "name": "四川", "child": [{ "name": "四川" }, { "name": "成都" }, { "name": "自贡" }, { "name": "攀枝花" }, { "name": "泸州" }, { "name": "德阳" }, { "name": "绵阳" }, { "name": "广元" }, { "name": "遂宁" }, { "name": "内江" }, { "name": "乐山" }, { "name": "南充" }, { "name": "眉山" }, { "name": "宜宾" }, { "name": "广安" }, { "name": "达州" }, { "name": "雅安" }, { "name": "巴中" }, { "name": "资阳" }, { "name": "阿坝藏族羌族自治州" }, { "name": "甘孜藏族自治州" }, { "name": "凉山彝族自治州" }] }, { "name": "贵州", "child": [{ "name": "贵州" }, { "name": "贵阳" }, { "name": "六盘水" }, { "name": "遵义" }, { "name": "安顺" }, { "name": "铜仁地区" }, { "name": "毕节地区" }, { "name": "黔西南布依族苗族自治州" }, { "name": "黔东南苗族侗族自治州" }, { "name": "黔南布依族苗族自治州" }] }, { "name": "云南", "child": [{ "name": "云南" }, { "name": "昆明" }, { "name": "曲靖" }, { "name": "玉溪" }, { "name": "保山" }, { "name": "昭通" }, { "name": "丽江" }, { "name": "普洱" }, { "name": "临沧" }, { "name": "德宏傣族景颇族自治州" }, { "name": "怒江傈僳族自治州" }, { "name": "迪庆藏族自治州" }, { "name": "大理白族自治州" }, { "name": "楚雄彝族自治州" }, { "name": "红河哈尼族彝族自治州" }, { "name": "文山壮族苗族自治州" }, { "name": "西双版纳傣族自治州" }] }, { "name": "西藏", "child": [{ "name": "西藏" }, { "name": "拉萨" }, { "name": "那曲地区" }, { "name": "昌都地区" }, { "name": "林芝地区" }, { "name": "山南地区" }, { "name": "日喀则地区" }, { "name": "阿里地区" }] }, { "name": "陕西", "child": [{ "name": "陕西" }, { "name": "西安" }, { "name": "铜川" }, { "name": "宝鸡" }, { "name": "咸阳" }, { "name": "渭南" }, { "name": "延安" }, { "name": "汉中" }, { "name": "榆林" }, { "name": "安康" }, { "name": "商洛" }] }, { "name": "甘肃", "child": [{ "name": "甘肃" }, { "name": "兰州" }, { "name": "嘉峪关" }, { "name": "金昌" }, { "name": "白银" }, { "name": "天水" }, { "name": "武威" }, { "name": "酒泉" }, { "name": "张掖" }, { "name": "庆阳" }, { "name": "平凉" }, { "name": "定西" }, { "name": "陇南" }, { "name": "临夏回族自治州" }, { "name": "甘南藏族自治州" }] }, { "name": "青海", "child": [{ "name": "青海" }, { "name": "西宁" }, { "name": "海东地区" }, { "name": "海北藏族自治州" }, { "name": "海南藏族自治州" }, { "name": "黄南藏族自治州" }, { "name": "果洛藏族自治州" }, { "name": "玉树藏族自治州" }, { "name": "海西蒙古族藏族自治州" }] }, { "name": "宁夏", "child": [{ "name": "宁夏" }, { "name": "银川" }, { "name": "石嘴山" }, { "name": "吴忠" }, { "name": "固原" }, { "name": "中卫" }] }, { "name": "新疆", "child": [{ "name": "新疆" }, { "name": "乌鲁木齐" }, { "name": "克拉玛依" }, { "name": "吐鲁番地区" }, { "name": "哈密地区" }, { "name": "和田地区" }, { "name": "阿克苏地区" }, { "name": "喀什地区" }, { "name": "克孜勒苏柯尔克孜自治州" }, { "name": "巴音郭楞蒙古自治州" }, { "name": "昌吉回族自治州" }, { "name": "博尔塔拉蒙古自治州" }, { "name": "石河子" }, { "name": "阿拉尔" }, { "name": "图木舒克" }, { "name": "五家渠" }, { "name": "伊犁哈萨克自治州" }] }];
var cityArray=[{ "name": "热门城市", "child": [{ "name": "全国" }, { "name": "北京" }, { "name": "上海" }, { "name": "广州" }, { "name": "杭州" }, { "name": "成都" }, { "name": "四川" }, { "name": "西安" }, { "name": "武汉" }] }, { "name": "北京", "child": [{ "name": "北京" }] }, { "name": "天津", "child": [{ "name": "天津" }] }, { "name": "河北", "child": [{ "name": "河北" }, { "name": "石家庄" }, { "name": "唐山" }, { "name": "秦皇岛" }, { "name": "邯郸" }, { "name": "邢台" }, { "name": "保定" }, { "name": "张家口" }, { "name": "承德" }, { "name": "沧州" }, { "name": "廊坊" }, { "name": "衡水" }] }, { "name": "山西", "child": [{ "name": "山西" }, { "name": "太原" }, { "name": "大同" }, { "name": "阳泉" }, { "name": "长治" }, { "name": "晋城" }, { "name": "朔州" }, { "name": "忻州" }, { "name": "吕梁" }, { "name": "晋中" }, { "name": "临汾" }, { "name": "运城" }] }, { "name": "内蒙古", "child": [{ "name": "内蒙古" }, { "name": "呼和浩特" }, { "name": "包头" }, { "name": "乌海" }, { "name": "赤峰" }, { "name": "呼伦贝尔" }, { "name": "兴安盟" }, { "name": "通辽" }, { "name": "锡林郭勒盟" }, { "name": "乌兰察布盟" }, { "name": "伊克昭盟" }, { "name": "巴彦淖尔盟" }, { "name": "阿拉善盟" }] }, { "name": "辽宁", "child": [{ "name": "辽宁" }, { "name": "沈阳" }, { "name": "大连" }, { "name": "鞍山" }, { "name": "抚顺" }, { "name": "本溪" }, { "name": "丹东" }, { "name": "锦州" }, { "name": "营口" }, { "name": "阜新" }, { "name": "辽阳" }, { "name": "盘锦" }, { "name": "铁岭" }, { "name": "朝阳" }, { "name": "葫芦岛" }] }, { "name": "吉林", "child": [{ "name": "吉林" }, { "name": "长春" }, { "name": "吉林" }, { "name": "四平" }, { "name": "辽源" }, { "name": "通化" }, { "name": "白山" }, { "name": "松原" }, { "name": "白城" }, { "name": "延边朝鲜族自治州" }] }, { "name": "黑龙江", "child": [{ "name": "黑龙江" }, { "name": "哈尔滨" }, { "name": "齐齐哈尔" }, { "name": "鹤岗" }, { "name": "双鸭山" }, { "name": "鸡西" }, { "name": "大庆" }, { "name": "伊春" }, { "name": "牡丹江" }, { "name": "佳木斯" }, { "name": "七台河" }, { "name": "黑河" }, { "name": "绥化" }, { "name": "大兴安岭地区" }] }, { "name": "上海", "child": [{ "name": "上海" }] }, { "name": "江苏", "child": [{ "name": "江苏" }, { "name": "南京" }, { "name": "苏州" }, { "name": "无锡" }, { "name": "常州" }, { "name": "镇江" }, { "name": "南通" }, { "name": "泰州" }, { "name": "扬州" }, { "name": "盐城" }, { "name": "连云港" }, { "name": "徐州" }, { "name": "淮安" }, { "name": "宿迁" }] }, { "name": "浙江", "child": [{ "name": "浙江" }, { "name": "杭州" }, { "name": "宁波" }, { "name": "温州" }, { "name": "嘉兴" }, { "name": "湖州" }, { "name": "绍兴" }, { "name": "金华" }, { "name": "衢州" }, { "name": "舟山" }, { "name": "台州" }, { "name": "丽水" }] }, { "name": "安徽", "child": [{ "name": "安徽" }, { "name": "合肥" }, { "name": "芜湖" }, { "name": "蚌埠" }, { "name": "淮南" }, { "name": "马鞍山" }, { "name": "淮北" }, { "name": "铜陵" }, { "name": "安庆" }, { "name": "黄山" }, { "name": "滁州" }, { "name": "阜阳" }, { "name": "宿州" }, { "name": "巢湖" }, { "name": "六安" }, { "name": "亳州" }, { "name": "池州" }, { "name": "宣城" }] }, { "name": "福建", "child": [{ "name": "福建" }, { "name": "福州" }, { "name": "厦门" }, { "name": "莆田" }, { "name": "三明" }, { "name": "泉州" }, { "name": "漳州" }, { "name": "南平" }, { "name": "龙岩" }, { "name": "宁德" }] }, { "name": "江西", "child": [{ "name": "江西" }, { "name": "南昌" }, { "name": "景德镇" }, { "name": "萍乡" }, { "name": "九江" }, { "name": "新余" }, { "name": "鹰潭" }, { "name": "赣州" }, { "name": "吉安" }, { "name": "宜春" }, { "name": "抚州" }, { "name": "上饶" }] }, { "name": "山东", "child": [{ "name": "山东" }, { "name": "济南" }, { "name": "青岛" }, { "name": "淄博" }, { "name": "枣庄" }, { "name": "东营" }, { "name": "烟台" }, { "name": "潍坊" }, { "name": "济宁" }, { "name": "泰安" }, { "name": "威海" }, { "name": "日照" }, { "name": "莱芜" }, { "name": "临沂" }, { "name": "德州" }, { "name": "聊城" }, { "name": "滨州" }, { "name": "菏泽" }] }, { "name": "河南", "child": [{ "name": "河南" }, { "name": "郑州" }, { "name": "开封" }, { "name": "洛阳" }, { "name": "平顶山" }, { "name": "安阳" }, { "name": "鹤壁" }, { "name": "新乡" }, { "name": "焦作" }, { "name": "濮阳" }, { "name": "许昌" }, { "name": "漯河" }, { "name": "三门峡" }, { "name": "南阳" }, { "name": "商丘" }, { "name": "信阳" }, { "name": "周口" }, { "name": "驻马店" }, { "name": "焦作" }] }, { "name": "湖北", "child": [{ "name": "湖北" }, { "name": "武汉" }, { "name": "黄石" }, { "name": "十堰" }, { "name": "荆州" }, { "name": "宜昌" }, { "name": "襄樊" }, { "name": "鄂州" }, { "name": "荆门" }, { "name": "孝感" }, { "name": "黄冈" }, { "name": "咸宁" }, { "name": "随州" }, { "name": "恩施土家族苗族自治州" }, { "name": "仙桃" }, { "name": "天门" }, { "name": "潜江" }, { "name": "神农架林区" }] }, { "name": "湖南", "child": [{ "name": "湖南" }, { "name": "长沙" }, { "name": "株洲" }, { "name": "湘潭" }, { "name": "衡阳" }, { "name": "邵阳" }, { "name": "岳阳" }, { "name": "常德" }, { "name": "张家界" }, { "name": "益阳" }, { "name": "郴州" }, { "name": "永州" }, { "name": "怀化" }, { "name": "娄底" }, { "name": "湘西土家族苗族自治州" }] }, { "name": "广东", "child": [{ "name": "广东" }, { "name": "广州" }, { "name": "深圳" }, { "name": "东莞" }, { "name": "中山" }, { "name": "潮州" }, { "name": "揭阳" }, { "name": "云浮" }, { "name": "珠海" }, { "name": "汕头" }, { "name": "韶关" }, { "name": "佛山" }, { "name": "江门" }, { "name": "湛江" }, { "name": "茂名" }, { "name": "肇庆" }, { "name": "惠州" }, { "name": "梅州" }, { "name": "汕尾" }, { "name": "河源" }, { "name": "阳江" }, { "name": "清远" }] }, { "name": "广西", "child": [{ "name": "广西" }, { "name": "南宁" }, { "name": "柳州" }, { "name": "桂林" }, { "name": "梧州" }, { "name": "北海" }, { "name": "防城港" }, { "name": "钦州" }, { "name": "贵港" }, { "name": "玉林" }, { "name": "百色" }, { "name": "贺州" }, { "name": "河池" }, { "name": "来宾" }, { "name": "崇左" }] }, { "name": "海南", "child": [{ "name": "海南" }, { "name": "海口" }, { "name": "三亚" }, { "name": "五指山" }, { "name": "琼海" }, { "name": "儋州" }, { "name": "文昌" }, { "name": "万宁" }, { "name": "东方" }, { "name": "澄迈县" }, { "name": "定安县" }, { "name": "屯昌县" }, { "name": "临高县" }, { "name": "白沙黎族自治县" }, { "name": "昌江黎族自治县" }, { "name": "乐东黎族自治县" }, { "name": "陵水黎族自治县" }, { "name": "保亭黎族苗族自治县" }, { "name": "琼中黎族苗族自治县" }] }, { "name": "重庆", "child": [{ "name": "重庆" }] }, { "name": "四川", "child": [{ "name": "四川" }, { "name": "成都" }, { "name": "自贡" }, { "name": "攀枝花" }, { "name": "泸州" }, { "name": "德阳" }, { "name": "绵阳" }, { "name": "广元" }, { "name": "遂宁" }, { "name": "内江" }, { "name": "乐山" }, { "name": "南充" }, { "name": "眉山" }, { "name": "宜宾" }, { "name": "广安" }, { "name": "达州" }, { "name": "雅安" }, { "name": "巴中" }, { "name": "资阳" }, { "name": "阿坝藏族羌族自治州" }, { "name": "甘孜藏族自治州" }, { "name": "凉山彝族自治州" }] }, { "name": "贵州", "child": [{ "name": "贵州" }, { "name": "贵阳" }, { "name": "六盘水" }, { "name": "遵义" }, { "name": "安顺" }, { "name": "铜仁地区" }, { "name": "毕节地区" }, { "name": "黔西南布依族苗族自治州" }, { "name": "黔东南苗族侗族自治州" }, { "name": "黔南布依族苗族自治州" }] }, { "name": "云南", "child": [{ "name": "云南" }, { "name": "昆明" }, { "name": "曲靖" }, { "name": "玉溪" }, { "name": "保山" }, { "name": "昭通" }, { "name": "丽江" }, { "name": "普洱" }, { "name": "临沧" }, { "name": "德宏傣族景颇族自治州" }, { "name": "怒江傈僳族自治州" }, { "name": "迪庆藏族自治州" }, { "name": "大理白族自治州" }, { "name": "楚雄彝族自治州" }, { "name": "红河哈尼族彝族自治州" }, { "name": "文山壮族苗族自治州" }, { "name": "西双版纳傣族自治州" }] }, { "name": "西藏", "child": [{ "name": "西藏" }, { "name": "拉萨" }, { "name": "那曲地区" }, { "name": "昌都地区" }, { "name": "林芝地区" }, { "name": "山南地区" }, { "name": "日喀则地区" }, { "name": "阿里地区" }] }, { "name": "陕西", "child": [{ "name": "陕西" }, { "name": "西安" }, { "name": "铜川" }, { "name": "宝鸡" }, { "name": "咸阳" }, { "name": "渭南" }, { "name": "延安" }, { "name": "汉中" }, { "name": "榆林" }, { "name": "安康" }, { "name": "商洛" }] }, { "name": "甘肃", "child": [{ "name": "甘肃" }, { "name": "兰州" }, { "name": "嘉峪关" }, { "name": "金昌" }, { "name": "白银" }, { "name": "天水" }, { "name": "武威" }, { "name": "酒泉" }, { "name": "张掖" }, { "name": "庆阳" }, { "name": "平凉" }, { "name": "定西" }, { "name": "陇南" }, { "name": "临夏回族自治州" }, { "name": "甘南藏族自治州" }] }, { "name": "青海", "child": [{ "name": "青海" }, { "name": "西宁" }, { "name": "海东地区" }, { "name": "海北藏族自治州" }, { "name": "海南藏族自治州" }, { "name": "黄南藏族自治州" }, { "name": "果洛藏族自治州" }, { "name": "玉树藏族自治州" }, { "name": "海西蒙古族藏族自治州" }] }, { "name": "宁夏", "child": [{ "name": "宁夏" }, { "name": "银川" }, { "name": "石嘴山" }, { "name": "吴忠" }, { "name": "固原" }, { "name": "中卫" }] }, { "name": "新疆", "child": [{ "name": "新疆" }, { "name": "乌鲁木齐" }, { "name": "克拉玛依" }, { "name": "吐鲁番地区" }, { "name": "哈密地区" }, { "name": "和田地区" }, { "name": "阿克苏地区" }, { "name": "喀什地区" }, { "name": "克孜勒苏柯尔克孜自治州" }, { "name": "巴音郭楞蒙古自治州" }, { "name": "昌吉回族自治州" }, { "name": "博尔塔拉蒙古自治州" }, { "name": "石河子" }, { "name": "阿拉尔" }, { "name": "图木舒克" }, { "name": "五家渠" }, { "name": "伊犁哈萨克自治州" }] }];
const issue= [{"name": "成人", "child": [{"name": "全部"}, { "name": "抑郁症"},{"name": "焦虑症"},{"name": "强迫症"},{"name": "精神分裂"},{"name": "惊恐障碍"},{ "name": "双相障碍"},{"name": "躯体障碍"},{"name": "性心理"}]}, {"name": "儿童","child": [{"name": "全部"}, {"name": "孤独症"},{"name": "多动症"},{"name": "抑郁症"},{ "name": "强迫症"},{"name": "精神分裂"},{"name": "双相障碍"},{"name": "网络成瘾"},{"name": "亲子关系"},{"name": "性心理"}]}, {"name": "睡眠障碍","child": [{"name": "全部"}, {"name": "睡不着"},{ "name": "睡不醒"},{"name": "睡不好"}]}, {"name": "产前产后","child": [{"name": "全部"}, {"name": "焦虑"},{"name": "抑郁"},{"name": "恐惧"}, {"name": "过分依赖"}]}, {"name": "烟酒药成瘾","child": [{"name": "全部"}, {"name": "烟依赖"},{"name": "酒依赖"},{"name": "药依赖"}, { "name": "其他物质依赖"}]}, {
"name": "社会心理", "child": [{"name": "全部"}, {"name": "婚恋关系"},{"name": "亲密关系"},{"name": "家庭关系"},{"name": "亲子关系"},{"name": "人际关系"},{"name": "个人成长" },{"name": "情绪压力"},{"name": "职业规划"}]}, ]
module.exports ={
......
utils/config.js
'use strict';
const HOST_xinli = 'https://www.xiaodongai.com/xiaodongai/xinli';
// var HOST_xinli = 'https://www.xiaodongai.com/xiaodongai/xinli_ceshi_copy';
// var HOST_xinli = 'https://www.xiaodongai.com/xiaodongai/xinli_ceshi_copy';
const HOST_xinli_lb = 'https://static.xiaodongai.com/';
const HOST_P = "https://static.xiaodongai.com/xiaodongai/";
const HOST_P_K = "https://static.xiaodongai.com/xiaodongai/kongtian/";
// const HOST = "https://test-wechat.xiaodongai.com/";
// const HOST = "https://test-wechat.xiaodongai.com/";
const HOST = 'https://www.xiaodongai.com/xiaodongai/kongtian/';
// const HOST = 'https://www.xiaodongai.com/xiaodongai/ceshi/'; //测试库
// var HOST = 'http://192.168.0.123:8081/xiaodongai/ceshi/'; //本地
// var HOST = 'http://localhost/xiaodongai/kongtian/'; //本地
const patient = "https://online-patient.xiaodongai.com/" //推荐产品正式新地址
// const patient = "http://test.patient.xiaodongai.com/" //测试新地址
const orders = "https://online-cjob.xiaodongai.com/index.php/order/" //订单
// const orders = "http://120.53.134.66/index.php/api/"
// const HOST = 'https://www.xiaodongai.com/xiaodongai/ceshi/'; //测试库
// var HOST = 'http://192.168.0.123:8081/xiaodongai/ceshi/'; //本地
// var HOST = 'http://localhost/xiaodongai/kongtian/'; //本地
const patient = "https://online-patient.xiaodongai.com/" //推荐产品正式新地址
// const patient = "http://test.patient.xiaodongai.com/" //测试新地址
// const orders = "https://online-cjob.xiaodongai.com/index.php/order/" //订单中心 生产
const orders = "https://online-cjob.xiaodongai.com/index.php/order/" //订单中心 开发
// const orders = "http://120.53.134.66/index.php/api/"
const HOST_info = 'https://vivshi.com/xiaodongai/kongtian/'; // 弃用
......@@ -38,7 +39,8 @@ const url = {
* begin
* 订单中心
*/
getOrdersAddress:orders+"order_address/getOneByOrderNumber",//获取订单地址
getOrdersAddress:orders+"order_address/getOneByOrderNumber",//获取订单收货地址
getLogisticsNumber:orders+"order_logistics/getOneByOrderNumber",//获取订单物流编号
/**
* end
*/
......@@ -165,5 +167,4 @@ module.exports = {
HOST_yiyuan : HOST_yiyuan,
HOST_xinli : HOST_xinli,
HOST_xinli_lb : HOST_xinli_lb,
}
\ No newline at end of file
utils/service.js
......@@ -50,7 +50,7 @@ function getUserData(openid) {
let getUserDataUrl = config.url.getUserData;
let data = {};
data.openid = openid;
// data.openid='oYQX40HkqeZ36Kuq9M8APvwzizzc'
// data.openid='oYQX40AHxKlrHu_fVDrp4u486tsY'
return wxRequest.postRequest(getUserDataUrl, data);
};
/**
......@@ -647,7 +647,10 @@ function getOrdersAddress(param){
var getOrdersAddressUrl = config.url.getOrdersAddress;
return wxRequest.postRequest(getOrdersAddressUrl, param)
}
function getLogisticsNumber(param){
var getLogisticsNumberUrl=config.url.getLogisticsNumber;
return wxRequest.postRequest(getLogisticsNumberUrl,param)
}
function getBusStopListPromise(sid, stopType) {
var getStopListUrl = config.url.getBusStopList;
var data = {
......@@ -751,5 +754,6 @@ module.exports = {
getNormalProduct: getNormalProduct, //正常购买推荐产品
getQuickProduct: getQuickProduct, //快速购买推荐产品
productPay: productPay, //推荐产品支付
getOrdersAddress:getOrdersAddress,//获取订单地址
getOrdersAddress:getOrdersAddress,//获取订单收货地址
getLogisticsNumber:getLogisticsNumber,//获取物流单号
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment