位置服务更新

Sanakey

2020-10-13 245dd6f1b9a206019ba1680b5214d3bbcd870d72

 pages/order/order.wxml

@@ -5,19 +5,31 @@
<view style="height:{{clientHeight}};overflow:{{overflow}};">
  <form bindsubmit="placeOrder">
    <!-- wx:if="{{showAddr}}"  -->
    <view class="order" bindtap='getAddress'>
      <view class="order-row order-addr">
    <view class="order">
      <view class="order-row order-addr" bindtap='getAddress'>
        <text class="iconfont icon-weizhi"></text>
        <view class="order-row-center">
          <view class="row">
            <view>收货人：{{Address.LinkName}}</view>
            <view>{{Address.LinkName}}</view>
            <view class="tel-num">{{Address.Tel}}</view>
          </view>
          <view class="smallsize">收货地址：{{Address.FullAddress}}</view>
          <view class="row">
            <view class="smallsize no-wrap">{{Address.AddressName}} {{Address.Street}}</view>
            <view class="smallsize small-desc" wx:if="{{Address.TransDistance}}">{{Address.TransDistance}}</view>
          </view>
        </view>
        <text class="iconfont icon-xiayiyeqianjinchakangengduo"></text>
      </view>
      <view class="order-row" wx:if="{{Address.MaxPreSendMinutesDesc}}">
        <view class="order-row-left">
          立即送出
        </view>
        <view class="order-row-right radio-box" >
          <text class="fontcolor">大约 {{Address.MaxPreSendMinutesDesc}} 送达</text>
        </view>
      </view>
    </view>

    <!-- wx:if="{{showAddAddr}}" -->
    <!-- <view class="order order-" bindtap='getAddress' wx:if="{{showAddAddr}}">
      <view class="order-row order-addr">
@@ -102,18 +114,37 @@
        <view class="picker">{{PreSendDate?PreSendDate:"请填写交货日期"}}</view>
      </picker>

      <picker wx:if="{{isAllowSelectDeliveryMethod}}" class="order-row invoice" bindchange="deliveryMethodIndexChange" name="deliveryMethod" value="{{deliveryMethodIndex}}" range="{{deliveryMethod}}" >
        <view class="order-row-left">配送方式</view>
        <view class="picker">{{deliveryMethod[deliveryMethodIndex]?deliveryMethod[deliveryMethodIndex]:deliveryMethod[0]||''}}
          <text class="iconfont icon-xiayiyeqianjinchakangengduo"></text>
        </view>
      </picker>
      <view class="order-row" wx:else>
        <view class="order-row-left">配送方式</view>
        <view class="picker">{{deliveryMethod[deliveryMethodIndex]?deliveryMethod[deliveryMethodIndex]:deliveryMethod[0]||''}}
          <text wx:if="{{isAllowSelectDeliveryMethod}}" class="iconfont icon-xiayiyeqianjinchakangengduo"></text>
      <!-- <view wx:if="{{isAllowSelectDeliveryMethod}}"> -->
      <view wx:if="{{deliveryMethod.length>1}}">
        <picker class="order-row invoice" bindchange="deliveryMethodIndexChange" name="deliveryMethod" value="{{deliveryMethodIndex}}" range="{{deliveryMethod}}" range-key="FreeName">
          <view class="order-row-left">配送方式</view>
          <view class="picker">{{deliveryMethod[deliveryMethodIndex].FreeName?deliveryMethod[deliveryMethodIndex].FreeName:deliveryMethod[0].FreeName ||''}}
            <text class="iconfont icon-xiayiyeqianjinchakangengduo"></text>
          </view>
        </picker>
        <view class="order-row">
          <view class="order-row-left">配送费</view>
          <view class="order-row-right">
            <text class="fontcolor">{{deliveryMethod[deliveryMethodIndex].TransCosts}}元</text>
          </view>
        </view>
      </view>
      
      <view wx:if="{{deliveryMethod.length==1}}">
        <view class="order-row" >
          <view class="order-row-left">配送方式</view>
          <view class="picker">{{deliveryMethod[0].FreeName}}
            <!-- <text wx:if="{{isAllowSelectDeliveryMethod}}" class="iconfont icon-xiayiyeqianjinchakangengduo"></text> -->
          </view>
        </view>
        <view class="order-row">
          <view class="order-row-left">配送费</view>
          <view class="order-row-right">
            <text class="fontcolor">{{deliveryMethod[0].TransCosts}}元</text>
          </view>
        </view>
      </view>
      

      <view class="order-row remark">
        <view class="order-row-left">
@@ -223,7 +254,7 @@
      <input class="present-inp" type="text" placeholder="请输入礼品码" name="presentCode"></input>
        <button formType="submit" class="go-pay" >兑换</button>
      </form>
      

    </view>
  </c-fadeInOut>

@@ -232,18 +263,18 @@
    <view class="footer">
      <view class="footer-row {{showCart?'':'bdt'}}">
        <view class="box-cart">合计：
          <text>{{CurrencySign}}{{filters.toFix(totalMoney)}}</text>
          <text>{{CurrencySign}}{{filters.toFix(totalMoney+(deliveryMethod[deliveryMethodIndex]?deliveryMethod[deliveryMethodIndex].TransCosts:0))}}</text>
        </view>
        <!-- <c-authorize-info bind:authorize="placeOrder"> -->
          <button class="box-right" formType="submit">
            提交订单
          </button>
        <!-- </c-authorize-info> -->
        

      </view>
    </view>
  </form>
  <c-contact></c-contact>
  <!-- <c-contact></c-contact> -->
<!--  <template is="contactBtnTemplate" data="{{unreadMsgNum,newMsg,animationData}}" />-->
</view>

@@ -261,4 +292,4 @@
      <text> 为了给您提供更贴心的服务，我们需要您授权您的头像！</text>
   </view>
</van-dialog> -->
<c-must-authorize></c-must-authorize>
<c-must-authorize></c-must-authorize>