xt / xcx-book · Commits

Go to a project

Commit ab5a9e1edb8af9beda7f674fb360bd14254bf48d

Authored by wangfan
1 parent 91dd6dce
build: skipped

fixbug year

Inline Side-by-side
Showing 6 changed files with 79 additions and 54 deletions
@@ -48,60 +48,66 @@ @@ -48,60 +48,66 @@
48 </view> 48 </view>
49 <view class="question-mask" hidden="{{hiddenQuestion}}"> 49 <view class="question-mask" hidden="{{hiddenQuestion}}">
50 <view class="question page Medium"> 50 <view class="question page Medium">
51 - <view class="flex-rr bottom-opt-but" style="width: 100%;" bindtap="hideQuestion">  
52 - <image src="http://qn.colorcun.com/custom/lite-yd/image/que-cancel.png"></image> 51 + <view class="que-title flex-vc Semibold">
  52 + <view>常见问题说明</view>
53 </view> 53 </view>
54 - <view class="que-title flex-vc">常见问题说明</view>  
55 - <view class="block">  
56 - <view class="block-title">  
57 - 1.营销攻略  
58 - </view>  
59 - <view class="block-desc">  
60 - <view>  
61 - · 短信营销步骤：第一步创建营销内容，第二步提交审核，第三步审核通过投放； 54 + <view class="que-content">
  55 + <view class="block">
  56 + <view class="block-title">
  57 + 1.营销攻略
62 </view> 58 </view>
63 - </view>  
64 - </view>  
65 - <view class="block">  
66 - <view class="block-title">  
67 - 2.短信计费  
68 - </view>  
69 - <view class="block-desc">  
70 - <view>  
71 - · 短信字数＝短信模版内容字数 + 签名字数； 59 + <view class="block-desc">
  60 + <view>
  61 + · 短信营销步骤：第一步创建营销内容，第二步提交审核，第三步审核通过投放；
  62 + </view>
72 </view> 63 </view>
73 - <view>  
74 - <text decode="{{true}}">· 短信字数&lt;=70个字数，按照70个字数一条短信计算；</text> 64 + </view>
  65 + <view class="block">
  66 + <view class="block-title">
  67 + 2.短信计费
75 </view> 68 </view>
76 - <view>  
77 - <text decode="{{true}}">· 短信字数&gt;70个字数，即为长短信，按照67个字数记为一条短信计算；</text> 69 + <view class="block-desc">
  70 + <view>
  71 + · 短信字数＝短信模版内容字数 + 签名字数；
  72 + </view>
  73 + <view>
  74 + <text decode="{{true}}">· 短信字数&lt;=70个字数，按照70个字数一条短信计算；</text>
  75 + </view>
  76 + <view>
  77 + <text decode="{{true}}">· 短信字数&gt;70个字数，即为长短信，按照67个字数记为一条短信计算；</text>
  78 + </view>
78 </view> 79 </view>
79 </view> 80 </view>
80 - </view>  
81 - <view class="block">  
82 - <view class="block-title">  
83 - 3.短信审核  
84 - </view>  
85 - <view class="block-desc">  
86 - <view>  
87 - · 应国家监管要求，短信营销内容需要进行审核，审核记过将以短信/电话的方式通知到您； 81 + <view class="block">
  82 + <view class="block-title">
  83 + 3.短信审核
  84 + </view>
  85 + <view class="block-desc">
  86 + <view>
  87 + · 应国家监管要求，短信营销内容需要进行审核，审核记过将以短信/电话的方式通知到您；
  88 + </view>
  89 + <view>
  90 + · 预计1个工作日完成审核；
  91 + </view>
  92 + <view>
  93 + · 审核工作时间：周一至周五9:00-23:00（法定节日顺延）；
  94 + </view>
88 </view> 95 </view>
89 - <view>  
90 - · 预计1个工作日完成审核； 96 + </view>
  97 + <view class="block">
  98 + <view class="block-title">
  99 + 4.短信发放
91 </view> 100 </view>
92 - <view>  
93 - · 审核工作时间：周一至周五9:00-23:00（法定节日顺延）； 101 + <view class="block-desc">
  102 + <view>
  103 + · 短信发放时，需要有充足的短信余量，如果短信余量不足，将无法发送；
  104 + </view>
94 </view> 105 </view>
95 </view> 106 </view>
96 </view> 107 </view>
97 - <view class="block">  
98 - <view class="block-title">  
99 - 4.短信发放  
100 - </view>  
101 - <view class="block-desc">  
102 - <view>  
103 - · 短信发放时，需要有充足的短信余量，如果短信余量不足，将无法发送；  
104 - </view> 108 + <view class="que-bottom">
  109 + <view class="opt-but Semibold" bindtap="hideQuestion">
  110 + 关闭
105 </view> 111 </view>
106 </view> 112 </view>
107 </view> 113 </view>
@@ -88,19 +88,38 @@ @@ -88,19 +88,38 @@
88 .question{ 88 .question{
89 background-color: #fefefe; 89 background-color: #fefefe;
90 border-radius: 10rpx; 90 border-radius: 10rpx;
91 - bottom: 20rpx; 91 + bottom: 190rpx;
92 position: fixed; 92 position: fixed;
93 left:5%; 93 left:5%;
94 - max-height: 85%;  
95 - overflow-y: auto; 94 + height: 834rpx;
96 font-size: 30rpx; 95 font-size: 30rpx;
97 padding: 4%; 96 padding: 4%;
98 width: 82%; 97 width: 82%;
99 } 98 }
100 .que-title{ 99 .que-title{
101 font-size: 34rpx; 100 font-size: 34rpx;
102 - height: 48rpx;  
103 - line-height: 48rpx; 101 + height: 100rpx;
  102 +}
  103 +.que-title view{
  104 + margin-top: 40rpx;
  105 +}
  106 +.que-bottom{
  107 + height: 160rpx;
  108 +}
  109 +.opt-but{
  110 + width: 300rpx;
  111 + background-color: #199095;
  112 + height: 80rpx;
  113 + line-height: 80rpx;
  114 + font-size: 34rpx;
  115 + color:#FFFFFF;
  116 + margin: 34rpx auto 0;
  117 + border-radius: 10rpx;
  118 + text-align: center;
  119 +}
  120 +.que-content{
  121 + height: 574rpx;
  122 + overflow-y: auto;
104 } 123 }
105 .block-title{ 124 .block-title{
106 font-size: 34rpx; 125 font-size: 34rpx;
1 { 1 {
2 "navigationBarBackgroundColor": "#ffffff", 2 "navigationBarBackgroundColor": "#ffffff",
3 - "navigationBarTextStyle": "black", 3 + "navigationBarTextStyle": "light",
4 "navigationBarTitleText":"订座详情", 4 "navigationBarTitleText":"订座详情",
5 "usingComponents": { 5 "usingComponents": {
6 "userinfo": "/components/userinfo/userinfo", 6 "userinfo": "/components/userinfo/userinfo",
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 <view class="title">地址</view> 21 <view class="title">地址</view>
22 <view class="content flex-ll" bindtap="lookLocation"> 22 <view class="content flex-ll" bindtap="lookLocation">
23 <image src="http://qn.colorcun.com/custom/lite-yd/image/invit-addr.png" class="invit-addr"></image> 23 <image src="http://qn.colorcun.com/custom/lite-yd/image/invit-addr.png" class="invit-addr"></image>
24 - <view>{{detail.seller.real_address}}</view> 24 + <view>{{detail.seller.real_address||detail.seller.map_address}}</view>
25 </view> 25 </view>
26 </view> 26 </view>
27 <view class="opt flex-cc"> 27 <view class="opt flex-cc">
1 /* pages/customer/detail_customer.wxss */ 1 /* pages/customer/detail_customer.wxss */
2 -.page{ 2 +page{
3 color:#FFFFFF; 3 color:#FFFFFF;
4 background: url("http://qn.colorcun.com/custom/lite-yd/image/invit-bg.png") #353334; 4 background: url("http://qn.colorcun.com/custom/lite-yd/image/invit-bg.png") #353334;
5 } 5 }
@@ -84,9 +84,9 @@ Page({ @@ -84,9 +84,9 @@ Page({
84 if(opt.hasInvitation==1){ 84 if(opt.hasInvitation==1){
85 url = '/pages/customer/detail_invitation'; 85 url = '/pages/customer/detail_invitation';
86 } 86 }
87 - if (res.data.openid == opt.openid) {  
88 - url = '/pages/customer/detail_owner';  
89 - } 87 + // if (res.data.openid == opt.openid) {
  88 + // url = '/pages/customer/detail_owner';
  89 + // }
90 } 90 }
91 } 91 }
92 url+='?id='+res.data.id 92 url+='?id='+res.data.id