Merge branch 'dev'

view/xcx/pages/goods_logistics/index.js

@@ -40,8 +40,8 @@ Page({
     });
   },
   /**
-* 获取我的推荐
-*/
+   * 获取我的推荐
+   */
   get_host_product: function () {
     var that = this;
     var data = { offset: 1, limit: 4 }

view/xcx/pages/goods_logistics/index.wxml

@@ -1,34 +1,34 @@
 <navbar parameter='{{parameter}}'></navbar>
 <view class='logistics'>
-    <view class='header acea-row row-between row-top'>
-       <view class='pictrue'><image src='{{product.productInfo.image}}'></image></view>
-       <view class='text acea-row row-between'>
-          <view class='name line2'>{{product.productInfo.store_name}}</view>
-          <view class='money'>
-             <view>￥{{product.truePrice}}</view>
-             <view>x{{product.cart_num}}</view>
-          </view>
+  <view class='header acea-row row-between row-top'>
+    <view class='pictrue'><image src='{{product.productInfo.image}}'></image></view>
+    <view class='text acea-row row-between'>
+      <view class='name line2'>{{product.productInfo.store_name}}</view>
+      <view class='money'>
+        <view>￥{{product.truePrice}}</view>
+        <view>x{{product.cart_num}}</view>
+      </view>
+    </view>
+  </view>
+  <view class='logisticsCon'>
+    <view class='company acea-row row-between-wrapper'>
+      <view class='picTxt acea-row row-between-wrapper'>
+        <view class='iconfont icon-wuliu'></view>
+        <view class='text'>
+          <view><text class='name line1'>物流公司：</text> {{orderInfo.delivery_name}}</view>
+          <view class='express line1'><text class='name'>快递单号：</text> {{orderInfo.delivery_id}}</view>
         </view>
+      </view>
+      <view class='copy' bindtap='copyOrderId'>复制单号</view>
     </view>
-    <view class='logisticsCon'>
-       <view class='company acea-row row-between-wrapper'>
-          <view class='picTxt acea-row row-between-wrapper'>
-             <view class='iconfont icon-wuliu'></view>
-             <view class='text'>
-                <view><text class='name line1'>物流公司：</text> {{orderInfo.delivery_name}}</view>
-                <view class='express line1'><text class='name'>快递单号：</text> {{orderInfo.delivery_id}}</view>
-             </view>
-          </view>
-          <view class='copy' bindtap='copyOrderId'>复制单号</view>
-       </view>
-       <view class='item' wx:for="{{expressList}}" wx:key='index'>
-          <view class='circular {{index === 0 ? "on":""}}'></view>
-          <view class='text {{index===0 ? "on-font on":""}}'>
-              <view>{{item.status}}</view>
-              <view class='data {{index===0 ? "on-font on":""}}'>{{item.time}}</view>
-          </view>     
-       </view>
+    <view class='item' wx:for="{{expressList}}" wx:key='index'>
+      <view class='circular {{index === 0 ? "on":""}}'></view>
+      <view class='text {{index===0 ? "on-font on":""}}'>
+        <view>{{item.status}}</view>
+        <view class='data {{index===0 ? "on-font on":""}}'>{{item.time}}</view>
+      </view>     
     </view>
-    <recommend host_product="{{host_product}}"></recommend>
+  </view>
+  <recommend host_product="{{host_product}}"></recommend>
 </view>
 <authorize bind:onLoadFun="onLoadFun"></authorize>

view/xcx/pages/news_list/index.js

@@ -10,7 +10,7 @@ Page({
     parameter: {
       'navbar': '1',
       'return': '1',
-      'title': '资讯',
+      'title': '文档资讯',
       'color': false
     },
     imgUrls: [],

view/xcx/pages/user_cash/index.wxml

@@ -29,7 +29,7 @@
              </view>
              <view class='item acea-row row-between-wrapper'>
                  <view class='name'>提现</view>
-                 <view class='input'><input placeholder='最低提现金额{{minPrice}}' placeholder-class='placeholder' name="money" type='digit'></input></view>
+                 <view class='input'><input placeholder='最低提现金额{{minPrice}}元' placeholder-class='placeholder' name="money" type='digit'></input></view>
              </view>
              <view class='tip'>当前可提现金额: {{userInfo.commissionCount}}</view>
              <button formType="submit" class='bnt bg-color'>提现</button>
@@ -43,7 +43,7 @@
              </view>
               <view class='item acea-row row-between-wrapper'>
                  <view class='name'>提现</view>
-                 <view class='input'><input placeholder='最低提现金额{{minPrice}}' placeholder-class='placeholder' name="money" type='digit'></input></view>
+                 <view class='input'><input placeholder='最低提现金额{{minPrice}}元' placeholder-class='placeholder' name="money" type='digit'></input></view>
              </view>
              <view class='tip'>当前可提现金额: {{userInfo.commissionCount}}</view>
              <button formType="submit" class='bnt bg-color'>提现</button>
@@ -57,7 +57,7 @@
              </view>
               <view class='item acea-row row-between-wrapper'>
                  <view class='name'>提现</view>
-                 <view class='input'><input placeholder='最低提现金额{{minPrice}}' placeholder-class='placeholder' name="money" type='digit'></input></view>
+                 <view class='input'><input placeholder='最低提现金额{{minPrice}}元' placeholder-class='placeholder' name="money" type='digit'></input></view>
              </view>
              <view class='tip'>当前可提现金额: {{userInfo.commissionCount}}</view>
              <button formType="submit" class='bnt bg-color'>提现</button>