miniprogram / shop · 提交

转到一个项目

作者 zhangwei
提交 318a49ae476eef9944064e208c16831eb1f2acae 1 个父辈 95bc27c5

shop

内嵌 并排对比
正在显示 7 个修改的文件 包含 826 行增加 和 559 行删除
@@ -11,7 +11,6 @@ @@ -11,7 +11,6 @@
11 "pages/mine/addr_2/addr_2", 11 "pages/mine/addr_2/addr_2",
12 "pages/mine/addr_1/addr_1", 12 "pages/mine/addr_1/addr_1",
13 "pages/homeindex/homeindex", 13 "pages/homeindex/homeindex",
14 - "pages/index/index",  
15 "pages/logs/logs", 14 "pages/logs/logs",
16 "pages/mine/mine", 15 "pages/mine/mine",
17 "pages/mine/collect/collect" 16 "pages/mine/collect/collect"
1 // pages/kind/detail_1/detail_1.js 1 // pages/kind/detail_1/detail_1.js
2 const app = getApp(); 2 const app = getApp();
  3 +var WxParse = require('../../../wxParse/wxParse.js');
3 Page({ 4 Page({
4 -  
5 /** 5 /**
6 * 页面的初始数据 6 * 页面的初始数据
7 */ 7 */
@@ -10,28 +10,91 @@ Page({ @@ -10,28 +10,91 @@ Page({
10 showModal: false, 10 showModal: false,
11 hide: false, 11 hide: false,
12 num: 1, 12 num: 1,
13 - detail_id:null 13 + detail_id:null,
  14 + detailCon:{},
  15 + assess:[]
14 }, 16 },
15 17
16 /** 18 /**
17 * 生命周期函数--监听页面加载 19 * 生命周期函数--监听页面加载
18 */ 20 */
19 onLoad: function(options) { 21 onLoad: function(options) {
20 - this.detaiFun() 22 + this.setData({
  23 + detail_id:options.id
  24 + })
  25 + this.detaiFun(options.id)
  26 + this.assessFun()
  27 + },
  28 + goFirm_order1(e){
  29 +
  30 + wx.navigateTo({
  31 + url: '../firm_order1/firm_order1?id=' + e.currentTarget.dataset.id,
  32 + })
21 }, 33 },
22 34
23 // 商品详情数据 35 // 商品详情数据
24 - detaiFun(){ 36 + detaiFun(id){
25 let that = this; 37 let that = this;
26 let url ="home/index/shopEdit"; 38 let url ="home/index/shopEdit";
27 let params = { 39 let params = {
28 - shop_id:this.data.detail_id 40 + shop_id: id
  41 + }
  42 + let header = {
  43 + "XX-Token": '123123',
  44 + "XX-Device-Type": 'wxapp'
29 } 45 }
30 - app.post(url,params).then((res) =>{ 46 + app.post(url,params,header).then((res) =>{
31 console.log(res) 47 console.log(res)
32 that.setData({ 48 that.setData({
33 - 49 + detailCon:res,
  50 + content: res.content
  51 + })
  52 + WxParse.wxParse('content', 'html', this.data.content, this, 5);
  53 + }).catch((err) =>{
  54 + console.log(err)
  55 + })
  56 + },
  57 + // 商品评价页面
  58 + assessFun(){
  59 + let that = this;
  60 + let url = "home/index/shopMessage";
  61 + let header = {
  62 + "XX-Token": '123123',
  63 + "XX-Device-Type": 'wxapp'
  64 + }
  65 + let params = {
  66 + shop_id:that.data.detail_id,
  67 + }
  68 + app.post(url,params,header).then((res) =>{
  69 + console.log(res)
  70 + that.setData({
  71 + assess:res.data.list
  72 + })
  73 + }).catch((err) =>{
  74 + console.log(err)
34 }) 75 })
  76 + },
  77 + // 加入收藏
  78 + addFun(){
  79 + let that = this;
  80 + let url = "home/index/shopCollect";
  81 + let params = {
  82 + shop_id: that.data.detail_id,
  83 + };
  84 + let header = {
  85 + "XX-Token": '123123',
  86 + "XX-Device-Type": 'wxapp'
  87 + };
  88 + app.post(url,params,header).then((res) =>{
  89 + console.log(res)
  90 + // if(res.code == 20000){
  91 + wx.showToast({
  92 + title: res.msg,
  93 + icon: "none",
  94 + duration: 1500
  95 + })
  96 +
  97 + // }
35 }).catch((err) =>{ 98 }).catch((err) =>{
36 console.log(err) 99 console.log(err)
37 }) 100 })
@@ -4,30 +4,30 @@ @@ -4,30 +4,30 @@
4 <view class='ware_box'> 4 <view class='ware_box'>
5 <view class='ware_top'> 5 <view class='ware_top'>
6 <view class='ware_1'> 6 <view class='ware_1'>
7 - <image src='../../../img/gerenzhingxinbeijing@2x.png'></image> 7 + <image src='{{detailCon.thumb}}'></image>
8 <view class='ware_1_time'> 8 <view class='ware_1_time'>
9 据结束2时22分 9 据结束2时22分
10 </view> 10 </view>
11 </view> 11 </view>
12 <view class='ware_text'> 12 <view class='ware_text'>
13 <view class='ware_2'> 13 <view class='ware_2'>
14 - <text class='ware_2Txt1'>纯进口有机菜花</text>  
15 - <text class='ware_2Txt2'>产地：智力</text> 14 + <text class='ware_2Txt1'>{{detailCon.name}}</text>
  15 + <text class='ware_2Txt2'>产地：{{detailCon.origin}}</text>
16 </view> 16 </view>
17 <view class='ware_3'> 17 <view class='ware_3'>
18 <progress percent="42" show-info color="#B5DE96" border-radius="8" font-size="24rpx" stroke-width="16rpx" /> 18 <progress percent="42" show-info color="#B5DE96" border-radius="8" font-size="24rpx" stroke-width="16rpx" />
19 </view> 19 </view>
20 <view class='ware_4'> 20 <view class='ware_4'>
21 - <text>已拼300份，目标500份</text> 21 + <text>已拼{{detailCon.numb}}份，目标{{detailCon.group}}份</text>
22 </view> 22 </view>
23 <view class='ware_5'> 23 <view class='ware_5'>
24 <view> 24 <view>
25 - <text class='ware5_t1'>￥52/</text>  
26 - <text class='ware5_t2'>1磅1份</text> 25 + <text class='ware5_t1'>￥{{detailCon.money_sale}}/</text>
  26 + <text class='ware5_t2'>{{detailCon.shop_type}}</text>
27 </view> 27 </view>
28 <view class='ware5_box'> 28 <view class='ware5_box'>
29 - <view class='ware5_t3'>40mm-50m</view>  
30 - <view class='ware5_t4'>番茄果径</view> 29 + <view class='ware5_t3'>{{detailCon.text_table}}</view>
  30 + <view class='ware5_t4'>{{detailCon.text_content}}</view>
31 </view> 31 </view>
32 <view class='ware_6'> 32 <view class='ware_6'>
33 <view>立即参团</view> 33 <view>立即参团</view>
@@ -37,7 +37,7 @@ @@ -37,7 +37,7 @@
37 </view> 37 </view>
38 <view class='ware_bot'> 38 <view class='ware_bot'>
39 <view class='ware_bot_tit'>经典推荐</view> 39 <view class='ware_bot_tit'>经典推荐</view>
40 - <view class='ware_bot_txt'>智利进口，绿色健康，硕大饱满</view> 40 + <view class='ware_bot_txt'>{{detailCon.recommend}}</view>
41 </view> 41 </view>
42 </view> 42 </view>
43 </view> 43 </view>
@@ -54,24 +54,29 @@ @@ -54,24 +54,29 @@
54 </view> 54 </view>
55 <view class='ware_detailC'> 55 <view class='ware_detailC'>
56 <view class='ware_detailImg' wx:if="{{index == 1}}"> 56 <view class='ware_detailImg' wx:if="{{index == 1}}">
57 - <image src='../../../img/gerenzhingxinbeijing@3x.png'></image> 57 + <import src="../../../wxParse/wxParse.wxml" />
  58 + <template is="wxParse" data="{{wxParseData:content.nodes}}" />
58 </view> 59 </view>
59 <!-- 用户评价 --> 60 <!-- 用户评价 -->
60 <view class='ware_assess' wx:if="{{index == 2}}"> 61 <view class='ware_assess' wx:if="{{index == 2}}">
61 - <view class='ware_assess_li'> 62 + <view class='ware_assess_li' wx:for="{{assess}}" wx:key = "index">
62 <view class='assess_header'> 63 <view class='assess_header'>
63 <view class='assess_headerImg'> 64 <view class='assess_headerImg'>
64 - <image src='../../../img/jujia@2x.png'></image> 65 + <image src='{{item.avatar}}'></image>
65 </view> 66 </view>
66 - <view class='assess_headerTxt'>朱*明</view> 67 + <view class='assess_headerTxt'>{{item.user_nickname}}</view>
67 </view> 68 </view>
68 <view class='assess_say'> 69 <view class='assess_say'>
69 - 产品和描述一直，很喜欢他们家的东西，体验了下东西确实也不错 70 + {{item.text}}
  71 + </view>
  72 + <view class='ware_pic'>
  73 + <view class='ware_picBox'>
  74 + <image src='{{item.img}}'></image>
  75 + </view>
70 </view> 76 </view>
71 - <view class='ware_pic'></view>  
72 <view class='assess_time'>2019/07/01</view> 77 <view class='assess_time'>2019/07/01</view>
73 </view> 78 </view>
74 - <view class='ware_assess_li'> 79 + <!-- <view class='ware_assess_li'>
75 <view class='assess_header'> 80 <view class='assess_header'>
76 <view class='assess_headerImg'> 81 <view class='assess_headerImg'>
77 <image src='../../../img/jujia@2x.png'></image> 82 <image src='../../../img/jujia@2x.png'></image>
@@ -90,7 +95,7 @@ @@ -90,7 +95,7 @@
90 </view> 95 </view>
91 </view> 96 </view>
92 <view class='assess_time'>2019/07/01</view> 97 <view class='assess_time'>2019/07/01</view>
93 - </view> 98 + </view> -->
94 <view class='whole'> 99 <view class='whole'>
95 查看全部评价 100 查看全部评价
96 </view> 101 </view>
@@ -99,7 +104,7 @@ @@ -99,7 +104,7 @@
99 </view> 104 </view>
100 <!-- footer底部 --> 105 <!-- footer底部 -->
101 <view class='footer'> 106 <view class='footer'>
102 - <view class='footer_add'>加入收藏</view> 107 + <view class='footer_add' bindtap='addFun'>加入收藏</view>
103 <view class='footer_off' bindtap='goConfirm'>立即参团</view> 108 <view class='footer_off' bindtap='goConfirm'>立即参团</view>
104 </view> 109 </view>
105 <!-- 遮罩层 --> 110 <!-- 遮罩层 -->
@@ -109,16 +114,16 @@ @@ -109,16 +114,16 @@
109 <view class='modalDlg_p'> 114 <view class='modalDlg_p'>
110 <view class='m_top'> 115 <view class='m_top'>
111 <view class='m_topImg'> 116 <view class='m_topImg'>
112 - <image src='../../../img/douyao.png'></image> 117 + <image src='{{detailCon.thumb}}'></image>
113 </view> 118 </view>
114 <view class='m_topTxt'> 119 <view class='m_topTxt'>
115 <view class='m_topTxt1'> 120 <view class='m_topTxt1'>
116 - <view class='m_topName'>纯进口有机菜花</view> 121 + <view class='m_topName'>{{detailCon.name}}</view>
117 <image bindtap='m_close' src='../../../img/cha.png'></image> 122 <image bindtap='m_close' src='../../../img/cha.png'></image>
118 </view> 123 </view>
119 <view class='m_topTxt2'> 124 <view class='m_topTxt2'>
120 - <view class='m_topPrice'>￥52.00</view>  
121 - <view class='m_topHelf'>1磅1份</view> 125 + <view class='m_topPrice'>￥{{detailCon.money_sale}}</view>
  126 + <view class='m_topHelf'>{{detailCon.shop_type}}</view>
122 </view> 127 </view>
123 </view> 128 </view>
124 </view> 129 </view>
@@ -130,6 +135,6 @@ @@ -130,6 +135,6 @@
130 <view class='push' bindtap="bindPlus">+</view> 135 <view class='push' bindtap="bindPlus">+</view>
131 </view> 136 </view>
132 </view> 137 </view>
133 - <button class='m_btn' bindtap='goFirm_order1'>确认</button> 138 + <button class='m_btn' bindtap='goFirm_order1' data-id="{{detailCon.shop_id}}">确认</button>
134 </view> 139 </view>
135 </view> 140 </view>
1 /* pages/kind/detail_1/detail_1.wxss */ 1 /* pages/kind/detail_1/detail_1.wxss */
2 -page{  
3 - background: #F7F7F7; 2 +@import "../../../wxParse/wxParse.wxss";
  3 +page {
  4 + background: #f7f7f7;
4 } 5 }
5 -.container{ 6 +
  7 +.container {
6 overflow: hidden; 8 overflow: hidden;
7 background: white; 9 background: white;
8 - padding-bottom:48rpx;  
9 -}  
10 -.ware_box{  
11 - width:688rpx;  
12 - height:400rpx;  
13 - margin:32rpx auto;  
14 - background:#F9FAFC; 10 + padding-bottom: 48rpx;
15 } 11 }
16 -.ware_top{ 12 +
  13 +.ware_box {
  14 + width: 688rpx;
  15 + height: 400rpx;
17 overflow: hidden; 16 overflow: hidden;
  17 + margin:16rpx auto 0;
  18 + background: #f9fafc;
  19 +}
  20 +
  21 +.ware_top {
  22 + margin-top:44rpx;
18 display: flex; 23 display: flex;
19 - padding:32rpx 18rpx 0; 24 + padding:0 16rpx;
  25 + box-sizing: border-box;
20 } 26 }
21 -.ware_1{  
22 - width:312rpx;  
23 - height:208rpx; 27 +
  28 +.ware_1 {
  29 + width: 208rpx;
  30 + height: 208rpx;
24 position: relative; 31 position: relative;
25 } 32 }
26 -.ware_1 image{  
27 - width:100%;  
28 - height:100%; 33 +
  34 +.ware_1 image {
  35 + width: 100%;
  36 + height: 100%;
29 } 37 }
30 -.ware_1_time{ 38 +
  39 +.ware_1_time {
31 position: absolute; 40 position: absolute;
32 - bottom:0;  
33 - width:208rpx;  
34 - height:48rpx; 41 + bottom: 0;
  42 + width: 208rpx;
  43 + height: 48rpx;
35 color: white; 44 color: white;
36 text-align: center; 45 text-align: center;
37 - line-height:48rpx;  
38 - font-size:24rpx;  
39 - background:#FAC8C8;  
40 - font-family:PingFang SC; 46 + line-height: 48rpx;
  47 + font-size: 24rpx;
  48 + background: #fac8c8;
  49 + font-family: PingFang SC;
41 } 50 }
42 -.ware_text{ 51 +
  52 +.ware_text {
43 margin-left:14rpx; 53 margin-left:14rpx;
44 - width:100%;  
45 -}  
46 -.ware_2Txt1{  
47 - font-size:32rpx;  
48 - font-family:PingFang SC;  
49 - font-weight:600;  
50 - line-height:44rpx;  
51 - color:rgba(51,51,51,1);  
52 -}  
53 -.ware_2Txt2{  
54 - font-size:22rpx;  
55 - margin-left:98rpx;  
56 - font-family:PingFang SC;  
57 - font-weight:400;  
58 - line-height:32rpx;  
59 - color:rgba(204,204,204,1);  
60 -}  
61 -.ware_3 progress{  
62 - width:370rpx;  
63 - color:#B5DE96;  
64 - margin-top:24rpx;  
65 -}  
66 -.ware_4 text,.ware5_t2{  
67 - font-size:22rpx;  
68 - font-family:PingFang SC;  
69 - font-weight:400;  
70 - line-height:32rpx;  
71 - color:rgba(204,204,204,1);  
72 -}  
73 -.ware_5{ 54 +}
  55 +
  56 +.ware_2Txt1 {
  57 + font-size: 32rpx;
  58 + font-family: PingFang SC;
  59 + font-weight: 600;
  60 + line-height: 44rpx;
  61 + color: rgba(51, 51, 51, 1);
  62 +}
  63 +
  64 +.ware_2Txt2 {
  65 + font-size: 22rpx;
  66 + margin-left: 98rpx;
  67 + font-family: PingFang SC;
  68 + font-weight: 400;
  69 + line-height: 32rpx;
  70 + color: rgba(204, 204, 204, 1);
  71 +}
  72 +
  73 +.ware_3 progress {
  74 + width: 370rpx;
  75 + color: #b5de96;
  76 + margin-top: 24rpx;
  77 +}
  78 +
  79 +.ware_4 text{
  80 + font-size: 22rpx;
  81 + font-family: PingFang SC;
  82 + font-weight: 400;
  83 + line-height: 32rpx;
  84 + color: rgba(204, 204, 204, 1);
  85 +}
  86 +.ware5_t2 {
  87 + overflow:hidden;
  88 + text-overflow:ellipsis;
  89 + white-space:nowrap;
  90 + width:70rpx;
  91 + display: inline-block;
  92 + font-size: 22rpx;
  93 + font-family: PingFang SC;
  94 + font-weight: 400;
  95 + line-height: 19rpx;
  96 + margin-left:4rpx;
  97 + color: rgba(204, 204, 204, 1);
  98 +}
  99 +.ware_5 {
74 display: flex; 100 display: flex;
75 display: -webkit-flex; 101 display: -webkit-flex;
76 justify-content: space-between; 102 justify-content: space-between;
77 } 103 }
78 -.ware5_t1{  
79 - font-size:30rpx;  
80 - font-family:DIN 1451 Std Mittelschrift;  
81 - font-weight:400;  
82 - color:rgba(255,0,0,1);  
83 -}  
84 -.ware5_t3{  
85 - font-size:22rpx;  
86 - font-family:PingFang SC;  
87 - font-weight:400;  
88 - line-height:30rpx;  
89 - color:rgba(51,51,51,1);  
90 -}  
91 -.ware5_t4{  
92 - font-size:18rpx;  
93 - font-family:PingFang SC;  
94 - font-weight:400;  
95 - color:rgba(153,153,153,1);  
96 -}  
97 -.ware_6{  
98 - width:144rpx;  
99 - height:48rpx;  
100 - background:rgba(249,150,20,1);  
101 - box-shadow:0px 2rpx 12rpx rgba(255,145,0,0.16);  
102 - border-radius:24rpx;  
103 -}  
104 -.ware_6 view{ 104 +.ware5_t1 {
  105 + width:110rpx;
  106 + overflow:hidden;
  107 + text-overflow:ellipsis;
  108 + white-space:nowrap;
105 font-size:26rpx; 109 font-size:26rpx;
106 - font-family:PingFang SC;  
107 - font-weight:400; 110 + font-family: DIN 1451 Std Mittelschrift;
  111 + font-weight: 400;
  112 + color: rgba(255, 0, 0, 1);
  113 +}
  114 +
  115 +.ware5_t3 {
  116 + width:104rpx;
  117 + overflow:hidden;
  118 + text-overflow:ellipsis;
  119 + white-space:nowrap;
  120 + font-size: 20rpx;
  121 + font-family: PingFang SC;
  122 + font-weight: 400;
  123 + line-height: 30rpx;
  124 + color: rgba(51, 51, 51, 1);
  125 +}
  126 +
  127 +.ware5_t4 {
  128 + width:104rpx;
  129 + overflow:hidden;
  130 + text-overflow:ellipsis;
  131 + white-space:nowrap;
  132 + font-size: 18rpx;
  133 + font-family: PingFang SC;
  134 + font-weight: 400;
  135 + color: rgba(153, 153, 153, 1);
  136 +}
  137 +
  138 +.ware_6 {
  139 + width: 144rpx;
  140 + height: 48rpx;
  141 + margin-left: 14rpx;
  142 + background: rgba(249, 150, 20, 1);
  143 + box-shadow: 0px 2rpx 12rpx rgba(255, 145, 0, 0.16);
  144 + border-radius: 24rpx;
  145 +}
  146 +.ware5_box{
  147 + margin-left:4rpx;
  148 +}
  149 +.ware_6 view {
  150 + font-size: 26rpx;
  151 + font-family: PingFang SC;
  152 + font-weight: 400;
108 text-align: center; 153 text-align: center;
109 - line-height:48rpx;  
110 - color:rgba(255,255,255,1); 154 + line-height: 48rpx;
  155 + color: rgba(255, 255, 255, 1);
111 } 156 }
112 -.ware_bot{  
113 - width:670rpx;  
114 - height:80rpx; 157 +
  158 +.ware_bot {
  159 + width: 670rpx;
  160 + height: 80rpx;
115 margin: auto; 161 margin: auto;
116 display: flex; 162 display: flex;
117 - line-height:80rpx;  
118 - margin-top:32rpx;  
119 - background-color:#F1F7F1;  
120 -}  
121 -.ware_bot_tit{  
122 - font-size:30rpx;  
123 - font-weight:bold;  
124 - margin-left:32rpx;  
125 - color:rgba(110,172,61,1);  
126 -}  
127 -.ware_bot_tit:after{  
128 - content:"";  
129 - margin:0 38rpx;  
130 - border-right:1px solid #B5DE96;  
131 -}  
132 -.ware_bot_txt{  
133 - font-size:24rpx;  
134 - font-family:PingFang SC;  
135 - font-weight:400;  
136 - color:rgba(153,153,153,1); 163 + line-height: 80rpx;
  164 + margin-top: 32rpx;
  165 + background-color: #f1f7f1;
137 } 166 }
  167 +
  168 +.ware_bot_tit {
  169 + font-size: 30rpx;
  170 + font-weight: bold;
  171 + margin-left: 32rpx;
  172 + color: rgba(110, 172, 61, 1);
  173 +}
  174 +
  175 +.ware_bot_tit:after {
  176 + content: "";
  177 + margin: 0 38rpx;
  178 + border-right: 1px solid #b5de96;
  179 +}
  180 +
  181 +.ware_bot_txt {
  182 + font-size: 24rpx;
  183 + font-family: PingFang SC;
  184 + font-weight: 400;
  185 + color: rgba(153, 153, 153, 1);
  186 +}
  187 +
138 /* 规格 */ 188 /* 规格 */
139 -.spec{  
140 - width:100%;  
141 - padding:0 32rpx;  
142 - line-height:80rpx; 189 +
  190 +.spec {
  191 + width: 100%;
  192 + padding: 0 32rpx;
  193 + line-height: 80rpx;
143 display: flex; 194 display: flex;
144 - height:80rpx;  
145 - margin-top:8rpx;  
146 - background:white;  
147 -}  
148 -.spec_txt{  
149 - font-size:32rpx;  
150 - font-family:PingFang SC;  
151 - font-weight:400;  
152 - color:rgba(51,51,51,1);  
153 -}  
154 -.spec_txt2{  
155 - font-size:24rpx;  
156 - font-family:PingFang SC;  
157 - font-weight:400;  
158 - margin-left:108rpx;  
159 - color:rgba(153,153,153,1); 195 + height: 80rpx;
  196 + margin-top: 8rpx;
  197 + background: white;
  198 +}
  199 +
  200 +.spec_txt {
  201 + font-size: 32rpx;
  202 + font-family: PingFang SC;
  203 + font-weight: 400;
  204 + color: rgba(51, 51, 51, 1);
  205 +}
  206 +
  207 +.spec_txt2 {
  208 + font-size: 24rpx;
  209 + font-family: PingFang SC;
  210 + font-weight: 400;
  211 + margin-left: 108rpx;
  212 + color: rgba(153, 153, 153, 1);
160 } 213 }
  214 +
161 /* 商品详情 */ 215 /* 商品详情 */
162 -.ware_detail{  
163 - width:100%;  
164 - margin-top:8rpx;  
165 - margin-bottom:96rpx;  
166 - padding-bottom:66rpx; 216 +
  217 +.ware_detail {
  218 + width: 100%;
  219 + margin-top: 8rpx;
  220 + margin-bottom: 96rpx;
  221 + padding-bottom: 66rpx;
167 background: white; 222 background: white;
168 } 223 }
169 -.ware_detail_tit{  
170 - width:688rpx; 224 +
  225 +.ware_detail_tit {
  226 + width: 688rpx;
171 margin: auto; 227 margin: auto;
172 display: flex; 228 display: flex;
173 - padding:44rpx 0rpx 42rpx;  
174 - justify-content:space-around;  
175 - border-bottom:2rpx solid #F5F5F5; 229 + padding: 44rpx 0rpx 42rpx;
  230 + justify-content: space-around;
  231 + border-bottom: 2rpx solid #f5f5f5;
176 } 232 }
177 -.ware_detail .ware_active{  
178 - color:#6EAC3D;  
179 - font-weight:600; 233 +
  234 +.ware_detail .ware_active {
  235 + color: #6eac3d;
  236 + font-weight: 600;
180 } 237 }
181 -.ware_active:after{ 238 +
  239 +.ware_active:after {
182 content: ""; 240 content: "";
183 - width:16rpx; 241 + width: 16rpx;
184 height: 6rpx; 242 height: 6rpx;
185 margin: auto; 243 margin: auto;
186 display: block; 244 display: block;
187 - margin-top:6rpx;  
188 - border-radius:8rpx;  
189 - background:rgba(110,172,61,1); 245 + margin-top: 6rpx;
  246 + border-radius: 8rpx;
  247 + background: rgba(110, 172, 61, 1);
190 } 248 }
191 -.ware_detail_tit view{  
192 - font-size:28rpx;  
193 - font-family:PingFang SC;  
194 - font-weight:400;  
195 - color:rgba(153,153,153,1); 249 +
  250 +.ware_detail_tit view {
  251 + font-size: 28rpx;
  252 + font-family: PingFang SC;
  253 + font-weight: 400;
  254 + color: rgba(153, 153, 153, 1);
196 } 255 }
197 -.ware_detailC{  
198 - width:688rpx;  
199 - margin:26rpx auto 0; 256 +
  257 +.ware_detailC {
  258 + width: 688rpx;
  259 + margin: 26rpx auto 0;
200 } 260 }
201 261
202 -.ware_detailImg{  
203 - width:688rpx;  
204 - height:470rpx; 262 +.ware_detailImg {
  263 + width: 688rpx;
  264 + height: 470rpx;
205 } 265 }
206 -.ware_detailImg image{  
207 - width:100%;  
208 - height:100%; 266 +
  267 +.ware_detailImg image {
  268 + width: 100%;
  269 + height: 100%;
209 } 270 }
  271 +
210 /* 用户评价 */ 272 /* 用户评价 */
211 -.ware_assess_li{  
212 - padding-bottom:24rpx;  
213 - margin-bottom:32rpx;  
214 - border-bottom: 1px solid #F5F5F5; 273 +
  274 +.ware_assess_li {
  275 + padding-bottom: 24rpx;
  276 + margin-bottom: 32rpx;
  277 + border-bottom: 1px solid #f5f5f5;
215 } 278 }
216 -.assess_header{ 279 +
  280 +.assess_header {
217 display: flex; 281 display: flex;
218 justify-content: space-between; 282 justify-content: space-between;
219 } 283 }
220 -.assess_headerImg{  
221 - width:64rpx;  
222 - height:64rpx;  
223 -}  
224 -.assess_headerImg image{  
225 - width:100%;  
226 - height:100%;  
227 -}  
228 -.assess_headerTxt{  
229 - font-size:24rpx;  
230 - font-family:PingFang SC;  
231 - font-weight:400;  
232 - color:rgba(153,153,153,1);  
233 -}  
234 -.assess_say{  
235 - font-size:30rpx;  
236 - font-family:PingFang SC;  
237 - font-weight:400;  
238 - margin-top:18rpx;  
239 - color:rgba(102,102,102,1);  
240 -}  
241 -.assess_time{  
242 - font-size:22rpx;  
243 - font-family:PingFang SC;  
244 - font-weight:400;  
245 - margin-top:12rpx;  
246 - color:rgba(153,153,153,1);  
247 -}  
248 -.ware_pic{ 284 +
  285 +.assess_headerImg {
  286 + width: 64rpx;
  287 + height: 64rpx;
  288 +}
  289 +
  290 +.assess_headerImg image {
  291 + width: 100%;
  292 + height: 100%;
  293 +}
  294 +
  295 +.assess_headerTxt {
  296 + font-size: 24rpx;
  297 + font-family: PingFang SC;
  298 + font-weight: 400;
  299 + color: rgba(153, 153, 153, 1);
  300 +}
  301 +
  302 +.assess_say {
  303 + font-size: 30rpx;
  304 + font-family: PingFang SC;
  305 + font-weight: 400;
  306 + margin-top: 18rpx;
  307 + color: rgba(102, 102, 102, 1);
  308 +}
  309 +
  310 +.assess_time {
  311 + font-size: 22rpx;
  312 + font-family: PingFang SC;
  313 + font-weight: 400;
  314 + margin-top: 12rpx;
  315 + color: rgba(153, 153, 153, 1);
  316 +}
  317 +
  318 +.ware_pic {
249 display: flex; 319 display: flex;
250 - width:100%;  
251 - margin-top:10rpx; 320 + width: 100%;
  321 + margin-top: 10rpx;
252 } 322 }
253 -.ware_picBox{ 323 +
  324 +.ware_picBox {
254 margin-right: 16rpx; 325 margin-right: 16rpx;
255 } 326 }
256 -.ware_picBox image{  
257 - width:112rpx;  
258 - height:112rpx; 327 +
  328 +.ware_picBox image {
  329 + width: 112rpx;
  330 + height: 112rpx;
259 } 331 }
  332 +
260 /* 全部评价 */ 333 /* 全部评价 */
261 -.whole{  
262 - width:336rpx;  
263 - height:64rpx;  
264 - background:rgba(255,255,255,1);  
265 - border:2rpx solid rgba(230,230,230,1);  
266 - border-radius:166rpx;  
267 - font-size:26rpx; 334 +
  335 +.whole {
  336 + width: 336rpx;
  337 + height: 64rpx;
  338 + background: rgba(255, 255, 255, 1);
  339 + border: 2rpx solid rgba(230, 230, 230, 1);
  340 + border-radius: 166rpx;
  341 + font-size: 26rpx;
268 text-align: center; 342 text-align: center;
269 - line-height:64rpx;  
270 - font-family:PingFang SC;  
271 - font-weight:400; 343 + line-height: 64rpx;
  344 + font-family: PingFang SC;
  345 + font-weight: 400;
272 margin: auto; 346 margin: auto;
273 - color:rgba(102,102,102,1); 347 + color: rgba(102, 102, 102, 1);
274 } 348 }
  349 +
275 /* footer */ 350 /* footer */
276 -.footer{ 351 +
  352 +.footer {
277 position: fixed; 353 position: fixed;
278 bottom: 0; 354 bottom: 0;
279 text-align: center; 355 text-align: center;
280 - width:750rpx;  
281 - height:96rpx; 356 + width: 750rpx;
  357 + height: 96rpx;
282 display: flex; 358 display: flex;
283 - line-height:66rpx; 359 + line-height: 66rpx;
284 align-items: center; 360 align-items: center;
285 justify-content: center; 361 justify-content: center;
286 - background:rgba(255,255,255,1);  
287 - box-shadow:0px -2rpx 12rpx rgba(0,0,0,0.06);  
288 -}  
289 -.footer_add,.footer_off{  
290 - width:272rpx;  
291 - height:64rpx;  
292 - font-size:32rpx;  
293 - font-family:PingFang SC;  
294 - font-weight:600;  
295 - border-radius:32rpx;  
296 - border:2rpx solid rgba(172,212,66,1);  
297 -}  
298 -.footer_add{  
299 - background:rgba(255,255,255,1);  
300 - margin-right:32rpx;  
301 - color:rgba(110,172,61,1);  
302 -}  
303 -.footer_off{  
304 - background:linear-gradient(159deg,rgba(181,222,150,1) 0%,rgba(169,209,33,1) 100%);  
305 - box-shadow:0rpx 6rpx 40rpx rgba(136,255,0,0.16);  
306 - color:rgba(255,255,255,1); 362 + background: rgba(255, 255, 255, 1);
  363 + box-shadow: 0px -2rpx 12rpx rgba(0, 0, 0, 0.06);
  364 +}
  365 +
  366 +.footer_add, .footer_off {
  367 + width: 272rpx;
  368 + height: 64rpx;
  369 + font-size: 32rpx;
  370 + font-family: PingFang SC;
  371 + font-weight: 600;
  372 + border-radius: 32rpx;
  373 + border: 2rpx solid rgba(172, 212, 66, 1);
  374 +}
  375 +
  376 +.footer_add {
  377 + background: rgba(255, 255, 255, 1);
  378 + margin-right: 32rpx;
  379 + color: rgba(110, 172, 61, 1);
  380 +}
  381 +
  382 +.footer_off {
  383 + background: linear-gradient(159deg, rgba(181, 222, 150, 1) 0%, rgba(169, 209, 33, 1) 100%);
  384 + box-shadow: 0rpx 6rpx 40rpx rgba(136, 255, 0, 0.16);
  385 + color: rgba(255, 255, 255, 1);
307 } 386 }
  387 +
308 /* 遮罩层 */ 388 /* 遮罩层 */
309 -.mask{ 389 +
  390 +.mask {
310 width: 100%; 391 width: 100%;
311 height: 100%; 392 height: 100%;
312 position: fixed; 393 position: fixed;
@@ -316,116 +397,137 @@ page{ @@ -316,116 +397,137 @@ page{
316 z-index: 9000; 397 z-index: 9000;
317 opacity: 0.64; 398 opacity: 0.64;
318 } 399 }
  400 +
319 /* 弹出层 */ 401 /* 弹出层 */
320 -.modalDlg{  
321 - width:100%;  
322 - height:454rpx;  
323 - bottom:0; 402 +
  403 +.modalDlg {
  404 + width: 100%;
  405 + height: 454rpx;
  406 + bottom: 0;
324 position: fixed; 407 position: fixed;
325 z-index: 9999; 408 z-index: 9999;
326 background-color: #fff; 409 background-color: #fff;
327 } 410 }
328 -.modalDlg_p{  
329 - padding:0 30rpx; 411 +
  412 +.modalDlg_p {
  413 + padding: 0 30rpx;
330 } 414 }
331 -.m_top{ 415 +
  416 +.m_top {
332 display: flex; 417 display: flex;
333 } 418 }
334 -.m_topTxt1{ 419 +
  420 +.m_topTxt1 {
335 display: flex; 421 display: flex;
336 align-self: center; 422 align-self: center;
337 justify-content: space-between; 423 justify-content: space-between;
338 - margin-top:30rpx; 424 + margin-top: 30rpx;
339 } 425 }
340 -.m_topTxt{  
341 - width:100%;  
342 - margin-left:16rpx; 426 +
  427 +.m_topTxt {
  428 + width: 100%;
  429 + margin-left: 16rpx;
343 } 430 }
344 -.m_topImg{  
345 - margin-top:-48rpx; 431 +
  432 +.m_topImg {
  433 + margin-top: -48rpx;
346 display: flex; 434 display: flex;
347 } 435 }
348 -.m_topImg image{  
349 - width:208rpx;  
350 - height:208rpx; 436 +
  437 +.m_topImg image {
  438 + width: 208rpx;
  439 + height: 208rpx;
351 } 440 }
352 -.m_topTxt1 image{  
353 - width:32rpx;  
354 - height:32rpx; 441 +
  442 +.m_topTxt1 image {
  443 + width: 32rpx;
  444 + height: 32rpx;
355 } 445 }
356 -.m_topName{  
357 - font-size:32rpx;  
358 - font-family:PingFang SC;  
359 - font-weight:600;  
360 - color:rgba(51,51,51,1); 446 +
  447 +.m_topName {
  448 + font-size: 32rpx;
  449 + font-family: PingFang SC;
  450 + font-weight: 600;
  451 + color: rgba(51, 51, 51, 1);
361 } 452 }
362 -.m_topTxt2{ 453 +
  454 +.m_topTxt2 {
363 display: flex; 455 display: flex;
364 - margin-top:16rpx; 456 + margin-top: 16rpx;
365 align-items: center; 457 align-items: center;
366 } 458 }
367 -.m_topPrice{  
368 - font-size:28rpx;  
369 - font-family:DIN 1451 Std Mittelschrift;  
370 - font-weight:400;  
371 - color:#FF0000; 459 +
  460 +.m_topPrice {
  461 + font-size: 28rpx;
  462 + font-family: DIN 1451 Std Mittelschrift;
  463 + font-weight: 400;
  464 + color: #f00;
372 } 465 }
373 -.m_topHelf{  
374 - font-size:22rpx;  
375 - font-family:PingFang SC;  
376 - font-weight:400;  
377 - margin-left:16rpx;  
378 - color:rgba(204,204,204,1); 466 +
  467 +.m_topHelf {
  468 + font-size: 22rpx;
  469 + font-family: PingFang SC;
  470 + font-weight: 400;
  471 + margin-left: 16rpx;
  472 + color: rgba(204, 204, 204, 1);
379 } 473 }
380 -.m_number{ 474 +
  475 +.m_number {
381 display: flex; 476 display: flex;
382 align-items: center; 477 align-items: center;
383 - margin-top:18rpx; 478 + margin-top: 18rpx;
384 } 479 }
385 -.minus_push{ 480 +
  481 +.minus_push {
386 display: flex; 482 display: flex;
387 margin-left: auto; 483 margin-left: auto;
388 align-items: center; 484 align-items: center;
389 } 485 }
390 -.m_numTxt{  
391 - font-size:24rpx;  
392 - font-family:PingFang SC;  
393 - font-weight:400;  
394 - color:rgba(153,153,153,1); 486 +
  487 +.m_numTxt {
  488 + font-size: 24rpx;
  489 + font-family: PingFang SC;
  490 + font-weight: 400;
  491 + color: rgba(153, 153, 153, 1);
395 } 492 }
396 -.minus,.push{  
397 - width:48rpx;  
398 - height:48rpx;  
399 - font-size:40rpx; 493 +
  494 +.minus, .push {
  495 + width: 48rpx;
  496 + height: 48rpx;
  497 + font-size: 40rpx;
400 text-align: center; 498 text-align: center;
401 - line-height:48rpx;  
402 - border:2px solid rgba(110,172,61,1);  
403 - border-radius:50%; 499 + line-height: 48rpx;
  500 + border: 2px solid rgba(110, 172, 61, 1);
  501 + border-radius: 50%;
404 } 502 }
405 -.minus{  
406 - color: #6EAC3D; 503 +
  504 +.minus {
  505 + color: #6eac3d;
407 } 506 }
408 -.num{  
409 - margin:0 26rpx;  
410 - font-size:32rpx;  
411 - font-family:PingFang SC;  
412 - font-weight:400;  
413 - color:rgba(110,172,61,1); 507 +
  508 +.num {
  509 + margin: 0 26rpx;
  510 + font-size: 32rpx;
  511 + font-family: PingFang SC;
  512 + font-weight: 400;
  513 + color: rgba(110, 172, 61, 1);
414 } 514 }
415 -.push{ 515 +
  516 +.push {
416 color: white; 517 color: white;
417 - background:rgba(110,172,61,1);  
418 -}  
419 -.m_btn{  
420 - width:688rpx;  
421 - height:80rpx;  
422 - border:0;  
423 - margin-top:62rpx;  
424 - font-size:32rpx;  
425 - font-family:PingFang SC;  
426 - font-weight:600;  
427 - color:rgba(255,255,255,1);  
428 - background:linear-gradient(170deg,rgba(181,222,150,1) 0%,rgba(169,209,33,1) 100%);  
429 - box-shadow:0rpx 6rpx 40rpx rgba(162,255,0,0.15);  
430 - border-radius:48rpx; 518 + background: rgba(110, 172, 61, 1);
  519 +}
  520 +
  521 +.m_btn {
  522 + width: 688rpx;
  523 + height: 80rpx;
  524 + border: 0;
  525 + margin-top: 62rpx;
  526 + font-size: 32rpx;
  527 + font-family: PingFang SC;
  528 + font-weight: 600;
  529 + color: rgba(255, 255, 255, 1);
  530 + background: linear-gradient(170deg, rgba(181, 222, 150, 1) 0%, rgba(169, 209, 33, 1) 100%);
  531 + box-shadow: 0rpx 6rpx 40rpx rgba(162, 255, 0, 0.15);
  532 + border-radius: 48rpx;
431 } 533 }
@@ -10,25 +10,35 @@ Page({ @@ -10,25 +10,35 @@ Page({
10 * 页面的初始数据 10 * 页面的初始数据
11 */ 11 */
12 data: { 12 data: {
13 - 13 + shop_id:null,
  14 + order_list:{}
14 }, 15 },
15 16
16 /** 17 /**
17 * 生命周期函数--监听页面加载 18 * 生命周期函数--监听页面加载
18 */ 19 */
19 - onLoad: function(options) { 20 + onLoad: function(options){
  21 + this.setData({
  22 + shop_id:options.id
  23 + })
  24 + console.log(options.id)
20 this.order() 25 this.order()
21 }, 26 },
22 - order() { 27 + order(){
23 let that = this; 28 let that = this;
24 - let url = "home/index/shopMessage"; 29 + let url = "home/index/goods";
  30 + let header = {
  31 + "XX-Token": '123123',
  32 + "XX-Device-Type": 'wxapp'
  33 + }
25 let params = { 34 let params = {
26 - shop_id: this.data.detail_id 35 + shop_id: that.data.shop_id
  36 + // shop_numb:
27 } 37 }
28 - app.post(url, params).then((res) => { 38 + app.post(url,params,header).then((res) => {
29 console.log(res) 39 console.log(res)
30 that.setData({ 40 that.setData({
31 - 41 + order_list:res.shop
32 }) 42 })
33 }).catch((err) => { 43 }).catch((err) => {
34 console.log(err) 44 console.log(err)
@@ -12,10 +12,10 @@ @@ -12,10 +12,10 @@
12 </view> 12 </view>
13 <view class='o_text'> 13 <view class='o_text'>
14 <view class='o_namePhone'> 14 <view class='o_namePhone'>
15 - <view class='name'>朱小明</view>  
16 - <view class='phone'>150 **** 2104</view> 15 + <view class='name'>{{order_list.name}}</view>
  16 + <view class='phone'>{{order_list.mobile}}</view>
17 </view> 17 </view>
18 - <view class='address'>天津市和平区大沽北路15号环球金融中心2407</view> 18 + <view class='address'>{{order_list.address}}</view>
19 </view> 19 </view>
20 <image class='o_right' src='../../../img/right_1.png'></image> 20 <image class='o_right' src='../../../img/right_1.png'></image>
21 </view> 21 </view>
@@ -45,7 +45,45 @@ @@ -45,7 +45,45 @@
45 <view class='txt1_price'>￥52.00</view> 45 <view class='txt1_price'>￥52.00</view>
46 </view> 46 </view>
47 <view class='txt2'> 47 <view class='txt2'>
48 - <progress percent="42" show-info color="#B5DE96" border-radius="8" font-size="24rpx" stroke-width="16rpx"/> 48 + <progress percent="42" show-info color="#B5DE96" border-radius="8" font-size="24rpx" stroke-width="16rpx" />
  49 + <view class='order'>x4</view>
  50 + </view>
  51 + <view class='txt3'>已拼300份，目标500份</view>
  52 + </view>
  53 + </view>
  54 + <view class='goods_detail'>
  55 + <view class='goods_detail_pic'>
  56 + <view class='detail_pic2'>
  57 + <image src='../../../img/douyao.png'></image>
  58 + </view>
  59 + <view class='detail_pic_txt'>距结束2时22分</view>
  60 + </view>
  61 + <view class='detail_txt'>
  62 + <view class='txt1'>
  63 + <view class='txt1_name'>纯进口有机菜花</view>
  64 + <view class='txt1_price'>￥52.00</view>
  65 + </view>
  66 + <view class='txt2'>
  67 + <progress percent="42" show-info color="#B5DE96" border-radius="8" font-size="24rpx" stroke-width="16rpx" />
  68 + <view class='order'>x4</view>
  69 + </view>
  70 + <view class='txt3'>已拼300份，目标500份</view>
  71 + </view>
  72 + </view>
  73 + <view class='goods_detail'>
  74 + <view class='goods_detail_pic'>
  75 + <view class='detail_pic2'>
  76 + <image src='../../../img/douyao.png'></image>
  77 + </view>
  78 + <view class='detail_pic_txt'>距结束2时22分</view>
  79 + </view>
  80 + <view class='detail_txt'>
  81 + <view class='txt1'>
  82 + <view class='txt1_name'>纯进口有机菜花</view>
  83 + <view class='txt1_price'>￥52.00</view>
  84 + </view>
  85 + <view class='txt2'>
  86 + <progress percent="42" show-info color="#B5DE96" border-radius="8" font-size="24rpx" stroke-width="16rpx" />
49 <view class='order'>x4</view> 87 <view class='order'>x4</view>
50 </view> 88 </view>
51 <view class='txt3'>已拼300份，目标500份</view> 89 <view class='txt3'>已拼300份，目标500份</view>
@@ -74,8 +112,9 @@ @@ -74,8 +112,9 @@
74 <view class='footer'> 112 <view class='footer'>
75 <view class='footer_in'> 113 <view class='footer_in'>
76 <view class='f_txt1'>共1件商品</view> 114 <view class='f_txt1'>共1件商品</view>
77 - <view class='f_txt2'>合计: <text class='f_txt3'>￥52.00</text></view> 115 + <view class='f_txt2'>合计:
  116 + <text class='f_txt3'>￥52.00</text>
  117 + </view>
78 <view class='f_btn' bindtap='goFirm_order2'>立即支付</view> 118 <view class='f_btn' bindtap='goFirm_order2'>立即支付</view>
79 </view> 119 </view>
80 </view> 120 </view>
81 -  
1 /* pages/kind/firm_order1/firm_order1.wxss */ 1 /* pages/kind/firm_order1/firm_order1.wxss */
2 -page{  
3 - background: #F7F7F7; 2 +
  3 +page {
  4 + background: #f7f7f7;
4 } 5 }
5 -.container{ 6 +
  7 +.container {
6 position: relative; 8 position: relative;
7 } 9 }
8 -.header{  
9 - width:100%;  
10 - height:280rpx;  
11 - background:#6EAC3D; 10 +
  11 +.header {
  12 + width: 100%;
  13 + height: 280rpx;
  14 + background: #6eac3d;
12 } 15 }
13 -.order_box{ 16 +
  17 +.order_box {
14 position: absolute; 18 position: absolute;
15 - width:688rpx;  
16 - height:820rpx;  
17 - top:57rpx;  
18 - left:0;  
19 - right:0; 19 + width: 688rpx;
  20 + top: 57rpx;
  21 + left: 0;
  22 + right: 0;
20 margin: auto; 23 margin: auto;
  24 + margin-bottom:180rpx;
21 background: white; 25 background: white;
22 } 26 }
23 -.o_top{  
24 - width:100%; 27 +
  28 +.o_top {
  29 + width: 100%;
25 } 30 }
26 -.o_topIn{ 31 +
  32 +.o_topIn {
27 display: flex; 33 display: flex;
28 - padding:80rpx 32rpx 0; 34 + padding: 80rpx 32rpx 0;
29 } 35 }
30 -.o_namePhone{ 36 +
  37 +.o_namePhone {
31 display: flex; 38 display: flex;
32 - margin-top:4rpx;  
33 -}  
34 -.o_text{  
35 - width:100%;  
36 - margin-left:16rpx;  
37 -}  
38 -.o_topImg image{  
39 - width:96rpx;  
40 - height:96rpx;  
41 -}  
42 -.o_namePhone .name{  
43 - font-size:34rpx;  
44 - font-family:PingFang SC;  
45 - font-weight:600;  
46 - color:rgba(0,0,0,1);  
47 -}  
48 -.o_namePhone .phone{  
49 - font-size:34rpx; 39 + margin-top: 4rpx;
  40 +}
  41 +
  42 +.o_text {
  43 + width: 100%;
  44 + margin-left: 16rpx;
  45 +}
  46 +
  47 +.o_topImg image {
  48 + width: 96rpx;
  49 + height: 96rpx;
  50 +}
  51 +
  52 +.o_namePhone .name {
  53 + font-size: 34rpx;
  54 + font-family: PingFang SC;
  55 + font-weight: 600;
  56 + color: rgba(0, 0, 0, 1);
  57 +}
  58 +
  59 +.o_namePhone .phone {
  60 + font-size: 34rpx;
50 margin-left: auto; 61 margin-left: auto;
51 - font-family:PingFang SC;  
52 - font-weight:400;  
53 - color:rgba(0,0,0,1);  
54 -}  
55 -.address{  
56 - margin-top:8rpx;  
57 - font-size:22rpx;  
58 - font-family:PingFang SC;  
59 - font-weight:400;  
60 - color:rgba(153,153,153,1);  
61 -}  
62 -.o_right{  
63 - width:28rpx;  
64 - height:42rpx;  
65 - margin:26rpx 0 0 20rpx;  
66 -}  
67 -.o_top_bottom{  
68 - width:688rpx;  
69 - height:6rpx;  
70 -}  
71 -.o_body_case{  
72 - padding:30rpx;  
73 -}  
74 -.title_icon{  
75 - width:32rpx;  
76 - height:32rpx;  
77 -}  
78 -.title_icon image{  
79 - width:100%;  
80 - height:100%;  
81 -}  
82 -.title{ 62 + font-family: PingFang SC;
  63 + font-weight: 400;
  64 + color: rgba(0, 0, 0, 1);
  65 +}
  66 +
  67 +.address {
  68 + margin-top: 8rpx;
  69 + font-size: 22rpx;
  70 + font-family: PingFang SC;
  71 + font-weight: 400;
  72 + color: rgba(153, 153, 153, 1);
  73 +}
  74 +
  75 +.o_right {
  76 + width: 28rpx;
  77 + height: 42rpx;
  78 + margin: 26rpx 0 0 20rpx;
  79 +}
  80 +
  81 +.o_top_bottom {
  82 + width: 688rpx;
  83 + height: 6rpx;
  84 +}
  85 +
  86 +.o_body_case {
  87 + padding: 30rpx;
  88 +}
  89 +
  90 +.title_icon {
  91 + width: 32rpx;
  92 + height: 32rpx;
  93 +}
  94 +
  95 +.title_icon image {
  96 + width: 100%;
  97 + height: 100%;
  98 +}
  99 +
  100 +.title {
83 display: flex; 101 display: flex;
84 - padding-bottom:24rpx;  
85 - border-bottom:1px solid #F5F5F5;  
86 -}  
87 -.title_txt{  
88 - font-size:34rpx;  
89 - margin:2rpx 0 0 18rpx;  
90 - font-family:PingFang SC;  
91 - font-weight:400;  
92 - color:rgba(51,51,51,1);  
93 -}  
94 -.goods_detail_pic{ 102 + padding-bottom: 24rpx;
  103 +
  104 +}
  105 +
  106 +.title_txt {
  107 + font-size: 34rpx;
  108 + margin: 2rpx 0 0 18rpx;
  109 + font-family: PingFang SC;
  110 + font-weight: 400;
  111 + color: rgba(51, 51, 51, 1);
  112 +}
  113 +
  114 +.goods_detail_pic {
95 position: relative; 115 position: relative;
96 } 116 }
97 -.detail_pic2{  
98 - width:144rpx;  
99 - height:144rpx; 117 +
  118 +.detail_pic2 {
  119 + width: 144rpx;
  120 + height: 144rpx;
100 } 121 }
101 -.detail_pic2 image{  
102 - width:100%;  
103 - height:100%; 122 +
  123 +.detail_pic2 image {
  124 + width: 100%;
  125 + height: 100%;
104 } 126 }
105 -.goods_detail{  
106 - margin-top:32rpx; 127 +
  128 +.goods_detail {
  129 + padding-top: 32rpx;
107 display: flex; 130 display: flex;
108 -}  
109 -.detail_txt{  
110 - width:100%;  
111 - margin-left:16rpx;  
112 -}  
113 -.detail_pic_txt{  
114 - width:144rpx;  
115 - height:28rpx; 131 + margin-bottom:30rpx;
  132 + border-top:1px solid #f5f5f5;
  133 +}
  134 +
  135 +.detail_txt {
  136 + width: 100%;
  137 + margin-left: 16rpx;
  138 +}
  139 +
  140 +.detail_pic_txt {
  141 + width: 144rpx;
  142 + height: 28rpx;
116 position: absolute; 143 position: absolute;
117 bottom: 0; 144 bottom: 0;
118 - background: #FAC8C8;  
119 - font-size:20rpx; 145 + background: #fac8c8;
  146 + font-size: 20rpx;
120 text-align: center; 147 text-align: center;
121 - line-height:28rpx;  
122 - font-family:PingFang SC;  
123 - font-weight:400;  
124 - color:rgba(255,255,255,1); 148 + line-height: 28rpx;
  149 + font-family: PingFang SC;
  150 + font-weight: 400;
  151 + color: rgba(255, 255, 255, 1);
125 } 152 }
126 -.txt1{ 153 +
  154 +.txt1 {
127 display: flex; 155 display: flex;
128 } 156 }
129 -.txt1_name{  
130 - font-size:32rpx;  
131 - font-family:PingFang SC;  
132 - font-weight:600;  
133 - color:rgba(51,51,51,1); 157 +
  158 +.txt1_name {
  159 + font-size: 32rpx;
  160 + font-family: PingFang SC;
  161 + font-weight: 600;
  162 + color: rgba(51, 51, 51, 1);
134 } 163 }
135 -.txt1_price{ 164 +
  165 +.txt1_price {
136 margin-left: auto; 166 margin-left: auto;
137 - font-size:28rpx;  
138 - font-family:DIN 1451 Std Mittelschrift;  
139 - font-weight:400;  
140 - color:rgba(255,0,0,1);  
141 -}  
142 -.txt2 progress{  
143 - width:320rpx;  
144 - color:#B5DE96;  
145 - margin-top:24rpx;  
146 -}  
147 -.txt2{ 167 + font-size: 28rpx;
  168 + font-family: DIN 1451 Std Mittelschrift;
  169 + font-weight: 400;
  170 + color: rgba(255, 0, 0, 1);
  171 +}
  172 +
  173 +.txt2 progress {
  174 + width: 320rpx;
  175 + color: #b5de96;
  176 + margin-top: 24rpx;
  177 +}
  178 +
  179 +.txt2 {
148 display: flex; 180 display: flex;
149 } 181 }
150 -.order{  
151 - font-size:24rpx;  
152 - margin-top:22rpx; 182 +
  183 +.order {
  184 + font-size: 24rpx;
  185 + margin-top: 22rpx;
153 margin-left: auto; 186 margin-left: auto;
154 - font-family:PingFang SC;  
155 - font-weight:400;  
156 - color:rgba(153,153,153,1);  
157 -}  
158 -.txt3{  
159 - font-size:22rpx;  
160 - font-family:PingFang SC;  
161 - font-weight:400;  
162 - margin-top:10rpx;  
163 - color:rgba(204,204,204,1);  
164 -}  
165 -.freight{ 187 + font-family: PingFang SC;
  188 + font-weight: 400;
  189 + color: rgba(153, 153, 153, 1);
  190 +}
  191 +
  192 +.txt3 {
  193 + font-size: 22rpx;
  194 + font-family: PingFang SC;
  195 + font-weight: 400;
  196 + margin-top: 10rpx;
  197 + color: rgba(204, 204, 204, 1);
  198 +}
  199 +
  200 +.freight {
166 display: flex; 201 display: flex;
167 - margin-top:34rpx;  
168 - padding-bottom:24rpx;  
169 - border-bottom:1px solid #F5F5F5;  
170 -}  
171 -.freight_1,.freight_2{  
172 - font-size:28rpx;  
173 - font-family:PingFang SC;  
174 - font-weight:400;  
175 - color:rgba(102,102,102,1);  
176 -}  
177 -.freight,.freight_2{  
178 - font-weight:normal; 202 + margin-top: 34rpx;
  203 + padding-bottom: 24rpx;
  204 + border-bottom: 1px solid #f5f5f5;
  205 +}
  206 +
  207 +.freight_1, .freight_2 {
  208 + font-size: 28rpx;
  209 + font-family: PingFang SC;
  210 + font-weight: 400;
  211 + color: rgba(102, 102, 102, 1);
  212 +}
  213 +
  214 +.freight, .freight_2 {
  215 + font-weight: normal;
179 margin-left: auto; 216 margin-left: auto;
180 - font-family:DIN 1451 Std Engschrift; 217 + font-family: DIN 1451 Std Engschrift;
181 } 218 }
182 -.othor{  
183 - margin-top:44rpx; 219 +
  220 +.othor {
  221 + margin-top: 44rpx;
184 } 222 }
185 -.othor1{ 223 +
  224 +.othor1 {
186 display: flex; 225 display: flex;
187 align-items: center; 226 align-items: center;
188 - margin-bottom:16rpx;  
189 -}  
190 -.othor1_name{  
191 - font-size:32rpx;  
192 - font-family:PingFang SC;  
193 - font-weight:400;  
194 - color:rgba(51,51,51,1);  
195 -}  
196 -.othor1_con{  
197 - font-size:26rpx; 227 + margin-bottom: 16rpx;
  228 +}
  229 +
  230 +.othor1_name {
  231 + font-size: 32rpx;
  232 + font-family: PingFang SC;
  233 + font-weight: 400;
  234 + color: rgba(51, 51, 51, 1);
  235 +}
  236 +
  237 +.othor1_con {
  238 + font-size: 26rpx;
198 margin-left: auto; 239 margin-left: auto;
199 - font-family:PingFang SC;  
200 - font-weight:400;  
201 - color:rgba(153,153,153,1); 240 + font-family: PingFang SC;
  241 + font-weight: 400;
  242 + color: rgba(153, 153, 153, 1);
202 } 243 }
  244 +
203 /* footer */ 245 /* footer */
204 -.footer{ 246 +
  247 +.footer {
205 position: fixed; 248 position: fixed;
206 bottom: 0; 249 bottom: 0;
207 - width:100%;  
208 - height:102rpx;  
209 - margin-top:102rpx;  
210 - background:white;  
211 - box-shadow:0px -2px 12px rgba(0,0,0,0.07);  
212 -}  
213 -.footer_in{  
214 - height:102rpx; 250 + width: 100%;
  251 + height: 102rpx;
  252 + margin-top: 102rpx;
  253 + background: white;
  254 + box-shadow: 0px -2px 12px rgba(0, 0, 0, 0.07);
  255 +}
  256 +
  257 +.footer_in {
  258 + height: 102rpx;
215 display: flex; 259 display: flex;
216 align-items: center; 260 align-items: center;
217 } 261 }
218 -.f_txt1{  
219 - margin-left:36rpx;  
220 -}  
221 -.f_txt2{  
222 - margin-left:40rpx;  
223 -}  
224 -.f_txt1,.f_txt2{  
225 - font-size:28rpx;  
226 - font-family:PingFang SC;  
227 - font-weight:400;  
228 - color:rgba(51,51,51,1);  
229 -}  
230 -.footer .f_txt3{  
231 - font-size:28rpx;  
232 - font-family:DIN 1451 Std Mittelschrift;  
233 - font-weight:400;  
234 - color:rgba(255,0,0,1);  
235 -}  
236 -.f_btn{  
237 - width:318rpx;  
238 - height:102rpx; 262 +
  263 +.f_txt1 {
  264 + margin-left: 36rpx;
  265 +}
  266 +
  267 +.f_txt2 {
  268 + margin-left: 40rpx;
  269 +}
  270 +
  271 +.f_txt1, .f_txt2 {
  272 + font-size: 28rpx;
  273 + font-family: PingFang SC;
  274 + font-weight: 400;
  275 + color: rgba(51, 51, 51, 1);
  276 +}
  277 +
  278 +.footer .f_txt3 {
  279 + font-size: 28rpx;
  280 + font-family: DIN 1451 Std Mittelschrift;
  281 + font-weight: 400;
  282 + color: rgba(255, 0, 0, 1);
  283 +}
  284 +
  285 +.f_btn {
  286 + width: 318rpx;
  287 + height: 102rpx;
239 margin-left: auto; 288 margin-left: auto;
240 - font-size:34rpx; 289 + font-size: 34rpx;
241 text-align: center; 290 text-align: center;
242 - line-height:102rpx;  
243 - font-family:PingFang SC;  
244 - font-weight:600;  
245 - color:rgba(255,255,255,1);  
246 - background:linear-gradient(145deg,rgba(181,222,150,1) 0%,rgba(169,209,33,1) 100%); 291 + line-height: 102rpx;
  292 + font-family: PingFang SC;
  293 + font-weight: 600;
  294 + color: rgba(255, 255, 255, 1);
  295 + background: linear-gradient(145deg, rgba(181, 222, 150, 1) 0%, rgba(169, 209, 33, 1) 100%);
247 } 296 }