diff --git a/components/tabbar/tabbar.vue b/components/tabbar/tabbar.vue
index 3c82da9..4f3622d 100644
--- a/components/tabbar/tabbar.vue
+++ b/components/tabbar/tabbar.vue
@@ -64,7 +64,7 @@
"pagePath": "/pages/order/index",
"text": "订单",
"iconPath": "/static/resource/menu/icon_order.png",
- "selectedIconPath": "/static/resource/menu/icon_zhishi_on.png"
+ "selectedIconPath": "/static/resource/menu/icon_order_on.png"
},
{
id: 4,
diff --git a/packages/packagesPro/pages/proService/index.vue b/packages/packagesPro/pages/proService/index.vue
index 02409e3..5b7d785 100644
--- a/packages/packagesPro/pages/proService/index.vue
+++ b/packages/packagesPro/pages/proService/index.vue
@@ -1,8 +1,321 @@
+
+
+
+
+
+ 当日预定
+
+
+
+
+
+
+
+
+
+
+ {{mod.name}}
+ ￥{{mod.price}}/天
+
+
+ {{mod.age}}岁
+
+
+ {{mod.work_years}}年护理经验
+
+
+
+
+
+
+
+
+
+
+
+ 明日预定
+
+
+
+
+
+
+
+
+
+
+ {{mod.name}}
+ ￥{{mod.price}}/天
+
+
+ {{mod.age}}岁
+
+
+ {{mod.work_years}}年护理经验
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages.json b/pages.json
index d80f75e..f5ab3a7 100644
--- a/pages.json
+++ b/pages.json
@@ -137,7 +137,7 @@
"pagePath": "pages/order/index",
"text": "订单",
"iconPath": "/static/resource/menu/icon_order.png",
- "selectedIconPath": "/static/resource/menu/icon_zhishi_on.png"
+ "selectedIconPath": "/static/resource/menu/icon_order_on.png"
},
{
"pagePath": "pages/mine/index",
diff --git a/pages/find/index.vue b/pages/find/index.vue
index a69bb0f..9326675 100644
--- a/pages/find/index.vue
+++ b/pages/find/index.vue
@@ -5,23 +5,54 @@
请确认患者的病床信息
+
+
+
+
+
+ {{mod.text}}
+
+
- 病区/楼层
+ *病区/楼层
-
- 1212121
+
+ {{selectArea?selectArea:"请选择病区/楼层 >"}}
+
+
+ *病床
+
+
+
+ {{selectbed?selectbed:"请选择病床 >"}}
+
+
+
+
+
+
+ *
+ {{item.name}}
+
+
+
+ {{m.name}}
+
+
+
+
+
@@ -113,35 +144,27 @@
},
toChangeSex: function(t) {
+ var that = this;
var a;
var i = t.currentTarget.dataset.index;
var r = this.sexArr;
var s = r[i];
- var n = e(r);
- try {
- for (n.s(); !(a = n.n()).done;) {
- a.value.isChecked = false;
- }
- } catch (e) {
- console.log('CatchClause', e);
- console.log('CatchClause', e);
- n.e(e);
- } finally {
- n.f();
+ for (var a of r) {
+ a.isChecked = false;
}
s.isChecked ? (s.isChecked = false) : (s.isChecked = true);
- this.sexArr = r;
+ that.sexArr = r;
},
bindMultiPickerChange: function(e) {
console.log('picker发送选择改变，携带值为', e.detail.value);
var t = e.detail.value;
var that = this;
- this.multiIndex = e.detail.value;
- this.selectArea = that.showMuti[0][t[0]].name + ' ' + that.showMuti[1][t[1]].name;
- this.selectAreaID = that.showMuti[1][t[1]].id;
- this.selectbedID = '';
- this.selectbed = '';
+ that.multiIndex = e.detail.value;
+ that.selectArea = that.showMuti[0][t[0]].name + ' ' + that.showMuti[1][t[1]].name;
+ that.selectAreaID = that.showMuti[1][t[1]].id;
+ that.selectbedID = '';
+ that.selectbed = '';
that.loadBeds(that.selectAreaID);
},
@@ -160,14 +183,14 @@
a.multiArray[e.detail.column + 1] = [];
a.multiArray[e.detail.column + 1] = that.toArr(i.id, e.detail.column + 1);
}
-
-
- this.selectArea=that.showMuti[0][a.multiIndex[0]].name + ' ' + that.showMuti[1][a
+
+
+ this.selectArea = that.showMuti[0][a.multiIndex[0]].name + ' ' + that.showMuti[1][a
.multiIndex[1]
].name;
- this.selectAreaID=that.showMuti[1][a.multiIndex[1]].id,
- this.selectbedID= '',
- this.selectbed= ''
+ this.selectAreaID = that.showMuti[1][a.multiIndex[1]].id;
+ this.selectbedID = '';
+ this.selectbed = '';
that.loadBeds(that.showMuti[1][a.multiIndex[1]].id);
},
@@ -184,19 +207,13 @@
var r = [];
var s = this.product.factors;
if (s.length > 0) {
- var n;
- var c = e(s);
try {
- for (c.s(); !(n = c.n()).done;) {
- var o = n.value;
+ for (var o of s) {
var l = {};
l.title = o.name;
l.items = [];
- var u;
- var d = e(o.factor_items);
try {
- for (d.s(); !(u = d.n()).done;) {
- var h = u.value;
+ for (var h of o.factor_items) {
var f = {};
if (h.isChecked) {
f.id = h.factor_id;
@@ -205,22 +222,10 @@
i.push(f);
}
}
- } catch (e) {
- console.log('CatchClause', e);
- console.log('CatchClause', e);
- d.e(e);
- } finally {
- d.f();
- }
+ } catch (e) {} finally {}
r.push(l);
}
- } catch (e) {
- console.log('CatchClause', e);
- console.log('CatchClause', e);
- c.e(e);
- } finally {
- c.f();
- }
+ } catch (e) {} finally {}
}
for (var m = true, g = 0, p = r; g < p.length; g++) {
if (0 == (h = p[g]).items.length) {
@@ -247,7 +252,9 @@
selectAreaID: this.selectAreaID,
selectSex: v,
selectFactors: i,
- selectProduct: this.selectProduct
+ selectProduct: this.selectProduct,
+ selectProjectID:this.selectProjectID,
+ selectedProject:getApp().globalData.selectedProject.name
};
uni.setStorageSync('buyinfo', y);
uni.navigateTo({
@@ -314,7 +321,7 @@
showMuti: this.showMuti
};
n.showMuti[t] = JSON.parse(JSON.stringify(i));
- this.setData(n);
+ this.showMuti = JSON.parse(JSON.stringify(n.showMuti));
return JSON.parse(JSON.stringify(a));
},
@@ -345,35 +352,8 @@
var that = this;
util.request({
api: 'customer/get-product-by-project/' + that.selectProjectID,
- utilSuccess: function(t) {
- var i;
- var r = t;
- var s = r.factors;
- var n = e(s);
- try {
- for (n.s(); !(i = n.n()).done;) {
- var c;
- var o = i.value;
- var l = e(o.factor_items);
- try {
- for (l.s(); !(c = l.n()).done;) {
- c.value.isChecked = false;
- }
- } catch (e) {
- console.log('CatchClause', e);
- console.log('CatchClause', e);
- l.e(e);
- } finally {
- l.f();
- }
- }
- } catch (e) {
- console.log('CatchClause', e);
- console.log('CatchClause', e);
- n.e(e);
- } finally {
- n.f();
- }
+ utilSuccess: function(r) {
+
var u = {};
u.id = r.id;
u.name = r.name;
@@ -396,25 +376,18 @@
},
toSelectFactor: function(t) {
+ console.log(t)
var a;
var i = t.currentTarget.dataset.pindex;
var r = t.currentTarget.dataset.index;
var s = this.product;
var n = s.factors[i];
- var c = e(n.factor_items);
- try {
- for (c.s(); !(a = c.n()).done;) {
- a.value.isChecked = false;
- }
- } catch (e) {
- console.log('CatchClause', e);
- console.log('CatchClause', e);
- c.e(e);
- } finally {
- c.f();
+ for (var a of n.factor_items) {
+ a.isChecked = false;
}
n.factor_items[r].isChecked = true;
this.product = s
+ this.$forceUpdate();
},
}
@@ -449,4 +422,76 @@
font-size: 32rpx;
color: #303233;
}
+
+ .popcontent {
+
+ height: 80%;
+ overflow-y: auto;
+ }
+
+ .formitem {
+ display: flex;
+ justify-content: space-between;
+ border-bottom: 1rpx solid rgba(48, 50, 51, 0.1);
+ padding: 30rpx 10rpx;
+ }
+
+ .formitem-left {
+ font-weight: 300;
+ font-size: 26rpx;
+ color: #303233;
+ }
+
+ .formitem-right {
+ font-weight: 300;
+ font-size: 24rpx;
+ color: #303233;
+ display: flex;
+ flex-direction: row;
+ width: 70%;
+ flex-wrap: wrap;
+ justify-content: flex-end;
+ text-align: right;
+ }
+
+ .mformitem {
+ border: 1rpx solid #303233;
+ border-radius: 20rpx;
+ margin-right: 10rpx;
+ margin-bottom: 10rpx;
+ padding: 10rpx;
+ }
+
+ .active {
+ border: 1rpx solid #0ee2ba;
+ color: #0ee2ba;
+ }
+
+ .popfooter {
+ display: flex;
+ justify-content: center;
+ margin-top: 40rpx;
+ }
+
+ .btn {
+
+ background: linear-gradient(90deg, #0ee2ba, #67f7dc);
+ border-radius: 36rpx 36rpx 36rpx 36rpx;
+ height: 72rpx;
+ width: 347rpx;
+ font-weight: 300;
+ font-size: 26rpx;
+ line-height: 72rpx;
+ text-align: center;
+ position: relative;
+ color: #fff;
+ }
+
+ .btnbg {
+ width: 400rpx;
+ height: 76rpx;
+ position: absolute;
+ bottom: -36rpx;
+ left: -27rpx;
+ }
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 36a9ac5..2e244fe 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -16,7 +16,7 @@
-
+
找住院护工
平台保证
@@ -41,6 +41,24 @@
平台已服务{{orderTotalCount}}单
+
+
+
+
+
+
+
+
+ {{item.title}}
+ {{item.published_at}}
+
+
+
+
@@ -67,12 +85,6 @@
-
-
-
-
-
@@ -120,8 +132,8 @@
onShareAppMessage() {},
onLoad(options) {
var that = this;
- if(options.from=="selectHospital"){
- that.showHospital=true;
+ if (options.from == "selectHospital") {
+ that.showHospital = true;
}
uni.getLocation({
type: 'wgs84',
@@ -149,13 +161,13 @@
key: 'RA6BZ-4YLLR-HMZW4-WFR5N-6H6XQ-R6FVL'
});
var a = that.listAddr;
- var list=[];
- for(var b of a){
+ var list = [];
+ for (var b of a) {
list.push({
latitude: parseFloat(b.latitude),
longitude: parseFloat(b.longitude)
})
-
+
}
var lat = that.latitude;
var lon = that.longitude;
@@ -168,14 +180,14 @@
success: function(t) {
t = t.result;
for (var e = 0; e < t.elements.length; e++) {
- that.listAddr[e].distance = t.elements[e].distance / 1000;
+ that.listAddr[e].distance = t.elements[e].distance / 1000;
var n = that.listAddr[e];
if (n.distance < that.currentProject.distance) {
that.currentProject = n;
getApp().globalData.selectedProject = that.currentProject;
}
}
-
+
},
fail: function(t) {
console.error(t);
@@ -198,7 +210,7 @@
api: 'customer/get-projects',
utilSuccess: function(t) {
var o = getApp().globalData.selectedProject;
- that.currentProject=t[0]
+ that.currentProject = t[0]
that.listAddr = t;
that.getGeoCoder();
},
@@ -220,6 +232,9 @@
util.request({
api: 'customer/get-training-videos',
utilSuccess: function(e) {
+ for (var m of e.data) {
+ m.poster = util.HOST + m.poster;
+ }
that.news = e.data
that.loading = false
},
@@ -247,6 +262,11 @@
\ No newline at end of file