diff --git a/manifest.json b/manifest.json
index a21c9c4..d843a22 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "盛安到家",
- "appid" : "__UNI__0A81F4F",
+ "appid" : "__UNI__807ED4C",
"description" : "",
"versionName" : "1.0.1",
"versionCode" : 101,
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d5033c0..12c0ad1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -262,7 +262,7 @@
-
+
@@ -165,7 +165,7 @@
that.getData();
that.isVip=this.$queue.getData('isVIP');
},
-
+
methods:{
goNav(e) {
uni.navigateTo({
@@ -173,7 +173,7 @@
})
},
openpay(item) {
-
+
uni.navigateTo({
url:'/my/order/payModifyTc?ordersId='+item.id
})
@@ -200,7 +200,7 @@
'&limit='+10
})
}
-
+
},
getData(){
var that=this;
@@ -215,7 +215,7 @@
that.detailData=res.data.detailData;
that.backgroundImageUrl=that.mainData.packageImg;
}
- })
+ })
},
}
}
@@ -251,6 +251,8 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
+ margin-top: 5px;
+ height: 100px;
}
/deep/uni-checkbox .uni-checkbox-input{
width: 26px;
@@ -350,7 +352,7 @@
/* #ifndef MP-WEIXIN */
/* height: 130px; */
/* #endif */
-
+
}
.pay_btn {
width: 90%;
@@ -402,7 +404,7 @@
width: 34.03rpx;
height: 32.64rpx;
}
-
+
.shouc{
display: flex;
align-items: center;
@@ -466,7 +468,7 @@
align-items: center;
padding: 15px 0px;
}
-
+
.tese span:nth-child(1){
font-weight: bold;
font-size: 24rpx;
@@ -506,7 +508,7 @@
font-size: 30rpx;
color: #029d88;
}
-
+
.detail-foot-mian{
width: 100%;
display: flex;
@@ -583,7 +585,7 @@
width: 100%;
display: flex;
flex-direction: row;
- align-items: center;
+ align-items: center;
margin-top: 8rpx;
}
.header-bottom-money-jia{
@@ -594,7 +596,7 @@
margin-left: 5px;
}
.header-bottom-money-zhen span{
- color: #F95900;
+ color: #FF1200;
}
.header-bottom-money-zhen span:nth-child(1){
font-size: 26rpx;
@@ -611,7 +613,7 @@
flex-direction: row;
align-items: baseline;
}
-
+
.header-bottom-money-view{
width: 100%;
display: flex;
@@ -660,7 +662,7 @@
display: flex;
flex-direction: column;
}
-
+
.header{
width: 100%;
display: flex;
@@ -687,4 +689,4 @@
justify-content: fex-end;
background: #eefffa;
}
-
\ No newline at end of file
+
diff --git a/pages/my/serviceOderDrtail.vue b/pages/my/serviceOderDrtail.vue
index a8ca5f0..3200ca1 100644
--- a/pages/my/serviceOderDrtail.vue
+++ b/pages/my/serviceOderDrtail.vue
@@ -9,7 +9,7 @@
-
+
-
+
@@ -184,7 +185,7 @@
}],
this.openWay = 2;
// #endif
-
+
// #ifdef MP-WEIXIN
this.openLists = [{
image: '../../static/images/icon_weixin.png',
@@ -220,7 +221,7 @@
} else {
that.$queue.showToast(res.msg)
}
-
+
});
},
goOrder() {//生成orderId
@@ -249,7 +250,7 @@
} else {
that.$queue.showToast(res.msg)
}
-
+
});
},
openpay(item) {
@@ -267,7 +268,7 @@
selectWay: function(item) {
this.openWay = item.id;
},
-
+
payJZ() {
let that = this;
if (that.openWay == 1) { //零钱支付
@@ -324,7 +325,7 @@
})
that.getData()
// this.$queue.showToast('支付成功');
-
+
// uni.switchTab({
// url: '/pages/my/index'
// })
@@ -340,7 +341,7 @@
}
});
// #endif
-
+
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@@ -382,9 +383,9 @@
}
});
}
-
+
// #endif
-
+
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@@ -414,7 +415,7 @@
that.getData()
});
// #endif
-
+
// #ifdef APP-PLUS
let data = {
ordersId: that.tordersId,
@@ -428,7 +429,7 @@
});
// #endif
}
-
+
},
// 支付订单
pay() {
@@ -467,7 +468,7 @@
console.log('用户点击取消');
}
}
-
+
})
} else if (that.openWay == 2) { //微信支付
that.$queue.showLoading('支付中...')
@@ -495,7 +496,7 @@
})
that.getData()
// this.$queue.showToast('支付成功');
-
+
// uni.switchTab({
// url: '/pages/my/index'
// })
@@ -511,7 +512,7 @@
}
});
// #endif
-
+
// #ifdef H5
let ua = navigator.userAgent.toLowerCase();
if (ua.indexOf('micromessenger') != -1) {
@@ -559,9 +560,9 @@
}
});
}
-
+
// #endif
-
+
// #ifdef APP
let data = {
ordersId: that.order.ordersId,
@@ -592,7 +593,7 @@
that.getData()
});
// #endif
-
+
// #ifdef APP-PLUS
let data = {
ordersId: that.order.ordersId,
@@ -628,8 +629,8 @@
'&name='+this.nameText
})
}
-
-
+
+
},
getData(){
var that=this;
@@ -646,7 +647,7 @@
that.backgroundImageUrl=that.mainData.packageImg;
that.nameText="my"
}
- })
+ })
}else{//从首页 推荐进入 请求的接口
let data = {
mainId: that.serviData.id,
@@ -662,7 +663,7 @@
}
})
}
-
+
},
}
}
@@ -698,6 +699,8 @@
flex-direction: row;
align-items: center;
justify-content: space-between;
+ margin-top: 5px;
+ height: 100px;
}
/deep/uni-checkbox .uni-checkbox-input{
width: 26px;
@@ -797,7 +800,7 @@
/* #ifndef MP-WEIXIN */
/* height: 130px; */
/* #endif */
-
+
}
.pay_btn {
width: 90%;
@@ -850,7 +853,7 @@
width: 34.03rpx;
height: 32.64rpx;
}
-
+
.shouc{
display: flex;
align-items: center;
@@ -876,16 +879,18 @@
position: relative;
}
.detail-foot-title{
- width: 115px;
- height: 32px;
- background-image: url(../../static/servicePackage/horn.png);
+ width: 100px;
+ height:28px;
+ /*background-image: url(../../static/servicePackage/horn.png);
background-repeat: no-repeat;
- background-size: 100% 100%;
+ background-size: 100% 100%;*/
+ background: linear-gradient(90deg, #ffdf96, #feca76);
+ border-radius: 0 15rpx 0 30rpx;
font-weight: 400;
- font-size: 13px;
- color: #FFFFFF;
+ font-size: 14px;
+ color: #a13504;
text-align: right;
- line-height: 32px;
+ line-height: 28px;
padding-right: 15px;
position: absolute;
right: 0;
@@ -914,7 +919,7 @@
align-items: center;
padding: 15px 0px;
}
-
+
.tese span:nth-child(1){
font-weight: bold;
font-size: 24rpx;
@@ -954,7 +959,7 @@
font-size: 30rpx;
color: #029d88;
}
-
+
.detail-foot-mian{
width: 100%;
display: flex;
@@ -973,6 +978,10 @@
overflow: hidden;
text-overflow: ellipsis;
}
+ .jianjie-more{
+ color: #029d88;
+ font-size: 24rpx;
+ }
.header-bottom-mian{
margin: 3px 0px;
}
@@ -1031,7 +1040,7 @@
width: 100%;
display: flex;
flex-direction: row;
- align-items: center;
+ align-items: center;
margin-top: 8rpx;
}
.header-bottom-money-jia{
@@ -1059,7 +1068,7 @@
flex-direction: row;
align-items: baseline;
}
-
+
.header-bottom-money-view{
width: 100%;
display: flex;
@@ -1108,7 +1117,7 @@
display: flex;
flex-direction: column;
}
-
+
.header{
width: 100%;
display: flex;
@@ -1135,4 +1144,4 @@
justify-content: fex-end;
background: #eefffa;
}
-
\ No newline at end of file
+
diff --git a/pages/my/servicePackage.vue b/pages/my/servicePackage.vue
index f3200b7..727995c 100644
--- a/pages/my/servicePackage.vue
+++ b/pages/my/servicePackage.vue
@@ -23,21 +23,21 @@
-->
-
+
-
+
-
-
+
+
-
+
diff --git a/pages/shop/index.vue b/pages/shop/index.vue
index 985b8f9..09c4b66 100644
--- a/pages/shop/index.vue
+++ b/pages/shop/index.vue
@@ -18,9 +18,9 @@
-
+
diff --git a/static/kefu.png b/static/kefu.png
index fee7dcd..bdadc42 100644
Binary files a/static/kefu.png and b/static/kefu.png differ