修改密友列表分页

api/user.js

@@ -79,7 +79,7 @@ export default {
     list:(data)=>request.get('/api/point/records',data)
   },
   friend:{
-    list:()=>request.get('/api/user/referrals')
+    list:(params)=>request.get('/api/user/referrals',params)
   },
   updateUser:(data)=>request.put('/api/user/update',data),
   createPayment(order_id){

app.js

@@ -45,6 +45,7 @@ App({
     if(options.query.shared_user_code){
       this.globalData.shared_user_code = options.query.shared_user_code;
     }
+    this.checkUpdate();
   },
   navToLogin(){
     wx.reLaunch({
@@ -181,5 +182,27 @@ App({
   },
   getAddressList(){
     
+  },
+  checkUpdate() {
+    if (!wx.canIUse('getUpdateManager')) {
+      return;
+    }
+    const updateManager = wx.getUpdateManager();
+
+    updateManager.onCheckForUpdate((res) => {
+      console.log(res);
+    });
+    updateManager.onUpdateReady(() => {
+      wx.showModal({
+        title: '更新提示',
+        content: '新版本已准备好，重启应用以使用新版本',
+        showCancel: false,
+        success: (res) => {
+          if (res.confirm) {
+            updateManager.applyUpdate();
+          }
+        }
+      });
+    });
   }
 })

app.json

@@ -25,7 +25,8 @@
     "pages/my/setting/name/index",
     "pages/browser/index",
     "pages/my/promation/wx-group/index",
-    "pages/order/markup/index"
+    "pages/order/markup/index",
+    "pages/my/promation/share/index"
   ],
   "window": {
     "navigationBarTextStyle": "black",

components/merchantOrder/index.js

@@ -63,7 +63,7 @@ Component({
             }
           },
           fail:(res)=>{
-            console.log(res);
+            this.triggerEvent('payError');
           }
         })
       });

components/merchantOrder/index.wxml

@@ -1,4 +1,4 @@
-<page-container show="{{isShowConfirm}}" round close-on-slide-down>
+<page-container show="{{isShowConfirm}}" wx:if="{{isShowConfirm}}" round close-on-slide-down>
   <view class="content pc-content">
     <view class="title">{{product.name}}</view>
     <view class="tags">
@@ -12,8 +12,8 @@
         <label class="money">{{calculatedPrice.amount}}</label>
       </view>
       <view class="right">
-        <label class="key">赠送蜂蜜</label>
+        <label class="key">赠送积分</label>
-        <label class="weight">{{calculatedPrice.gift_points}}克</label>
+        <label class="weight">{{calculatedPrice.gift_points}}</label>
       </view>
     </view>
 

components/merchantOrder/index.wxss

@@ -1,5 +1,5 @@
 .pc-content{
-  padding:60rpx 30rpx 0 30rpx;
+  padding:20rpx 30rpx 0 30rpx;
 }
 .pc-content .title{
   font-size: 40rpx;

components/modalView/index.js

@@ -117,7 +117,7 @@ Component({
         if(valid.length>0)return;
       }
       this.setData({
-        show:false
+        _show:false
       });
       this.triggerEvent('ok',this.properties.content);
     },
@@ -125,6 +125,7 @@ Component({
       this.setData({
         show:false
       })
+      this.triggerEvent('afterLeave')
     }
   },
 

pages/help/index/index.js

@@ -22,6 +22,7 @@ Page({
 
     isShowOrderConfirm:false,
     preOrder:{},
+    order:{},
     preOrderUnPayId:'',
 
     manuallyChangedCommunity:false,
@@ -33,7 +34,9 @@ Page({
     navBarHeight:0,
     isShowPayModal:false,
 
-    appConfig:{}
+    appConfig:{},
+
+    orderStatus:userApi.order.status
   },
 
   /**
@@ -198,7 +201,7 @@ Page({
           params.packages = realItem;
         }
         if(res.data.price_request.pickup_images){
-          params.pickup_images_count = res.data.price_request.pickup_images_count;
+          // params.pickup_images_count = res.data.price_request.pickup_images_count;
           params.pickup_images = res.data.price_request.pickup_images;
         }
         userApi.order.pre(params).then((data)=>{
@@ -221,7 +224,7 @@ Page({
           }else{
             wx.showToast({
               icon:'error',
-              title: data.message,
+              title: data.message||'发生错误',
             });
           }
           this.setData(_setData);
@@ -267,19 +270,22 @@ Page({
         userApi.order.real(res.data).then((data)=>{
           this.setData({
             isShowOrderConfirm:false,
-            ordering:false
+            ordering:false,
+            order:data
           });
           wx.removeStorage({
             key: 'pre-order',
           });
-          wx.showTabBar({
+          if(data.order.status==this.data.orderStatus.created){
-            success(){
+            //创建成功并且不需要支付
-              wx.navigateTo({
+            this.paySuccess();
-                url: `/pages/help/success/index?id=${data.order.orderid}&success_text=${data.delivery_time}`,
+          }else{
-              })
+            //需要支付
-            }
+            const merchantPay = this.selectComponent('#merchantOrderComponent');
-          });
+            merchantPay.createPayment(data.order.orderid,true);
+          }
         }).catch((e)=>{
+          console.log(e);
           this.setData({
             ordering:false
           });
@@ -287,10 +293,32 @@ Page({
       }
     });
   },
+  paySuccess(){
+    wx.showTabBar({
+      success:()=>{
+        wx.navigateTo({
+          url: `/pages/help/success/index?id=${this.data.order.order.orderid}&success_text=${this.data.order.delivery_time}`,
+        })
+      }
+    });
+  },
+  payError(){
+    //订单创建成功，但是支付错误，还是要刷新
+    app.globalData.needRefreshOrderList = true;
+    wx.showTabBar({
+      success:()=>{
+        wx.navigateTo({
+          url: `/pages/order/detail/index?id=${this.data.order.order.orderid}`,
+        })
+      }
+    });
+  },
   enterPageContainer(){
+    console.log('enterPageContainer');
     // wx.hideTabBar();
   },
   leavePageContainer(){
+    console.log('leavePageContainer');
     wx.showTabBar();
   },
   /**
@@ -306,7 +334,6 @@ Page({
   onUnload() {
 
   },
-
   /**
    * 页面相关事件处理函数--监听用户下拉动作
    */

pages/help/index/index.json

@@ -1,7 +1,8 @@
 {
   "usingComponents": {
     "nav-bar":"/components/navbar",
-    "modal-view":"/components/modalView"
+    "modal-view":"/components/modalView",
+    "merchant-order":"/components/merchantOrder"
   },
   "navigationStyle": "custom"
 }

pages/help/index/index.wxml

@@ -55,11 +55,11 @@
       </view>
       <view class="item">
         <image class="icon" src="/assets/icon/help/icon2.png"/>
-        <view class="text">先享后付</view>
+        <view class="text">平价亲民</view>
       </view>
       <view class="item">
         <image class="icon" src="/assets/icon/help/icon3.png"/>
-        <view class="text">安全保障</view>
+        <view class="text">准时送达</view>
       </view>
     </view>
   </view>
@@ -82,11 +82,11 @@
       <view class="title">{{appConfig.join_group_title}}</view>
       <view class="sub-title">{{appConfig.join_group_desc}}</view>
     </view>
-    <button class="item right share" open-type="share">
+    <navigator url="/pages/my/promation/share/index" class="item right share">
       <image src="/assets/icon/help/share.png" class="icon"/>
       <view class="title">{{appConfig.share_button_title}}</view>
       <view class="sub-title">{{appConfig.share_button_mini_desc}}</view>
-    </button>
+    </navigator>
   </view>
   <!-- <navigator url="/pages/my/promation/wx-group/index?communityId={{currentCommunity.id}}" 
       class="promotion-panel" wx:if="{{currentCommunity.id}}" wx:if="{{appConfig&&appConfig.join_group_title}}">
@@ -134,15 +134,12 @@ bind:enter="enterPageContainer" bind:leave="leavePageContainer" wx:if="{{isShowO
       <view class="value money yellow">{{preOrder.price_info.coupon_discount_amount}}</view>
     </view>
     <view class="kv-item" wx:if="{{preOrder.price_info.points_discount_amount}}">
-      <view class="key">蜂蜜抵</view>
+      <view class="key">积分抵</view>
       <view class="value money yellow">{{preOrder.price_info.points_discount_amount}}</view>
     </view>
     <view class="kv-item">
       <view class="key">
         <view>应支付</view>
-        <view class="tags">
-          <view class="tag yellow">先享后付</view>
-        </view>
       </view>
       <view class="value money">{{preOrder.price_info.final_amount}}</view>
     </view>
@@ -151,5 +148,8 @@ bind:enter="enterPageContainer" bind:leave="leavePageContainer" wx:if="{{isShowO
     <button class="button" type="primary" bind:tap="getOrder" loading="{{ordering}}">确认下单</button>
   </view>
 </page-container>
-<modal-view titleText="你有订单未支付！" okButtonText="去支付" model:show="{{isShowPayModal}}" wx:if="{{isShowPayModal}}" bind:ok="navToUnPayOrder"/>
+<modal-view titleText="你有订单未支付！" okButtonText="去支付" show="{{isShowPayModal}}" 
+  bind:ok="navToUnPayOrder"/>
+
+<merchant-order id="merchantOrderComponent" bind:paySuccess="paySuccess" bind:payError="payError"/>
 

pages/help/index/index.wxss

@@ -103,7 +103,7 @@
 }
 .address-panel .bottom .text{
   color: #999999;
-  font-size: 24rpx;
+  font-size: 26rpx;
   margin-left: 8rpx;
   display: inline-block;
   vertical-align: middle;

pages/help/package/index.js

@@ -23,13 +23,33 @@ Page({
 
     isShowStationEditor:false,
 
-    currentEditStation:{}
+    currentEditStation:{},
+
+    isShowSameStation:false,
+    ignoreSameStation:false,
+    sameStationName:''
   },
 
   async bottomBarButtonTap(){
     const data = [];
+    const pickupImgs = [];
     let hasSame = false;
     this.data.choosedStationList.find((item,index)=>{
+      //查找ai识别中相同驿站
+      //代码写好，暂不开启
+      if(false){
+        let sameStations = this.data.choosedStationList.filter((_item)=>{
+          return (_item.name==item.name)&&!_item.id;
+        });
+        if(sameStations.length>1&&!this.data.ignoreSameStation){
+          hasSame = true;
+          this.setData({
+            isShowSameStation:true,
+            sameStationName:sameStations[0].name
+          })
+          return true;
+        }
+      }
       if(item.pickup_codes.length>0&&item.pickup_codes[0]!=''){
         //倒着找相同的索引 因为需要从后往前找
         const codes = item.pickup_codes.join(',').split(',').reverse();
@@ -50,12 +70,14 @@ Page({
             icon:'none',
             title: '取件码重复',
           })
-          console.log(this.data.choosedStationList[index],'----');
           this.setData({
             [`choosedStationList[${index}]`]:this.data.choosedStationList[index]
           })
           return true;
         }
+        if(item.imgUrl){
+          pickupImgs.push(item.imgUrl);
+        }
         data.push({
           id:item.id||'',
           name:item.name,
@@ -69,7 +91,8 @@ Page({
     //录入了有效取件码 或者 上传了取件图片||this.data.tempImgs.length>0
     if(data.length>0){
       let priceRequest = {
-        packages:data
+        packages:data,
+        pickup_images:pickupImgs.join(',')
       };
       if(this.data.timePeriodsIndex==-1){
         wx.showToast({
@@ -373,6 +396,34 @@ Page({
       urls: [url],
     })
   },
+  ignoreSameStation(){
+    this.data.ignoreSameStation = true;
+  },
+  sameStationAfterLeave(){
+    console.log(this.data.ignoreSameStation);
+    if(this.data.ignoreSameStation){
+      this.bottomBarButtonTap();
+    }
+  },
+  mergeStation(){
+    this.data.ignoreSameStation = false;
+    this.data.choosedStationList.map((item,index)=>{
+      if(!item.id){
+        //从当前往后找所有的
+        this.data.choosedStationList.map((_item,_index)=>{
+          if(_index>index){
+            if(_item.name == item.name&&!_item.id){
+              item.pickup_codes = item.pickup_codes.concat(_item.pickup_codes);
+              this.data.choosedStationList.splice(_index,1);
+            }
+          }
+        })
+      }
+    });
+    this.setData({
+      choosedStationList:this.data.choosedStationList
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/help/package/index.wxml

@@ -101,4 +101,12 @@
 
 <modal-view editable titleText="修改驿站" content="{{currentEditStation.name||''}}" 
   model:show="{{isShowStationEditor}}" use-input auto-focus bind:ok="editStationName"
-  contentPlaceholder="驿站名不能为空"/>
+  contentPlaceholder="驿站名不能为空"/>
+
+<modal-view class="same-station-view" titleText="合并驿站" show="{{isShowSameStation}}" 
+  bind:ok="ignoreSameStation" bind:cancel="mergeStation" ok-button-text="直接保存" cancel-button-text="立即合并" bind:afterLeave="sameStationAfterLeave">
+  <view class="content-text">
+  检测到有多个<label style="color:red;font-weight: bold;">{{sameStationName}}</label>，是否需要合并，
+  多个驿站会产生额外配送费用。
+  </view>
+</modal-view>

pages/help/package/index.wxss

@@ -258,4 +258,12 @@
 .manually-code .icon{
   width:28rpx;height:28rpx;
   margin-right:12rpx;
+}
+
+.same-station-view .content-text{
+  color: #666666;
+  font-size: 28rpx;
+  text-align: center;
+  margin:22rpx 0 40rpx 0;
+  line-height: 48rpx;
 }

pages/login/login.js

@@ -11,7 +11,7 @@ Page({
   },
   onLoad(options){
     this.setData({
-      userCode:options.shared_user_code||''
+      userCode:options.shared_user_code||app.globalData.shared_user_code||''
     });
 
     app.getAppConfig().then((data)=>{

pages/login/login.wxml

@@ -1,24 +1,28 @@
-<view class="login">
+<view class="custom-scroll-view login">
   <nav-bar>
     <label class="title">登录</label>
   </nav-bar>
-  <image src="/assets/imgs/login/text1.png" class="text1"/>
+  <view class="main">
-  <image src="/assets/imgs/login/text2.png" class="text2"/>
+    <view class="main-scroll">
-  <image src="/assets/imgs/login/main.png" class="main"/>
+      <image src="/assets/imgs/login/text1.png" class="text1"/>
-  <button class="button" type="primary" wx:if="{{isAgree}}" loading="{{loging}}" disabled="{{loging}}"
+      <image src="/assets/imgs/login/text2.png" class="text2"/>
-      open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">手机号快捷登录</button>
+      <image src="/assets/imgs/login/main.png" class="main-img" mode="aspectFit"/>
-  <button class="button" type="primary" bindtap="preLogin" wx:else>
+      <button class="button" type="primary" wx:if="{{isAgree}}" loading="{{loging}}" disabled="{{loging}}"
-    手机号快捷登录
+          open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">手机号快捷登录</button>
-  </button>
+      <button class="button" type="primary" bindtap="preLogin" wx:else>
-  <view class="agree">
+        手机号快捷登录
-    <radio-group bindchange="radioChange">
+      </button>
-      <label class="policy" animation="{{animation}}">
+      <view class="agree">
-        <radio class="radio" value="agree"></radio>
+        <radio-group bindchange="radioChange">
-        <label>我已阅读并同意</label>
+          <label class="policy" animation="{{animation}}">
-        <label class="yellow" capture-catch:tap="navToAgreement">《用户协议》</label>与
+            <radio class="radio" value="agree"></radio>
-        <label class="yellow" capture-catch:tap="navToDeliveryContract">《配送服务协议》</label>
+            <label>我已阅读并同意</label>
-      </label>
+            <label class="yellow" capture-catch:tap="navToAgreement">《用户协议》</label>与
-    </radio-group>
+            <label class="yellow" capture-catch:tap="navToDeliveryContract">《配送服务协议》</label>
+          </label>
+        </radio-group>
+      </view>
+    </view>
   </view>
   <view class="btn-no-login" bind:tap="goBack">暂不登录</view>
   <view class="user-code">{{userCode}}</view>

pages/login/login.wxss

@@ -4,7 +4,7 @@
   height:100vh;
 }
 .text1{
-  margin-top:120rpx;
+  /* margin-top:90rpx; */
   width:590rpx;
   height:56rpx;
 }
@@ -13,10 +13,11 @@
   height:40rpx;
   margin-top:40rpx;
 }
-.main{
+.main-img{
-  width:418rpx;
+  height:40vh;
-  height:448rpx;
+  width:60vw;
-  margin-top:122rpx;
+  display: block;
+  margin:70rpx auto;
 }
 .agree .yellow{
   color:#FEC400;
@@ -31,7 +32,7 @@
   margin-right:10rpx;
 }
 .button{
-  margin:30rpx 64rpx 60rpx 64rpx!important;
+  margin:0 64rpx 60rpx 64rpx!important;
 }
 .button[disabled]{
   background-color:#e4e4e4!important;
@@ -49,9 +50,20 @@
 
 .btn-no-login{
   position: absolute;
-  bottom:60rpx;
+  bottom:calc(var(--safe-bottom) + 40rpx);
   left:0;
   width:100%;
   text-align: center;
   color: #999999;
+}
+.custom-scroll-view .main{
+  display:flex;
+  align-items: center;
+  padding-bottom:calc(var(--safe-bottom) + 40rpx + 34rpx);
+  overflow: hidden;
+}
+.custom-scroll-view .main-scroll{
+  flex:1;
+  max-height: 100%;
+  overflow: auto;
 }

pages/my/coupon/index.js

@@ -33,6 +33,9 @@ Page({
     this.setData({
       listViewHeight:windowInfo.windowHeight-57
     })
+    this.data.pager.tab1.loading = false;
+    this.data.pager.tab2.loading = false;
+    this.data.pager.tab3.loading = false;
     this.loadList('tab1');
   },
   refreshList(){

pages/my/coupon/index.wxml

@@ -41,7 +41,8 @@
   <view class="item {{tabIndex==0?'':'used'}}" wx:for="{{tab2List}}" wx:key="id">
     <view class="left">
       <view class="name">{{item.coupon_name}}</view>
-      <view class="desc">有效期至 {{item.expire_time}}</view>
+      <view class="desc" wx:if="{{item.status=='USED'}}">使用时间 {{item.used_time}}</view>
+      <view class="desc" wx:else>有效期至 {{item.expire_time}}</view>
     </view>
     <view class="btn-area">
       <button class="use-btn" disabled type="primary" size="mini" 

pages/my/firend/index.js

@@ -39,12 +39,25 @@ Page({
     this.setData({
       pager:this.data.pager
     });
-    userApi.friend.list().then((data)=>{
+    userApi.friend.list({
-      this.data.pager.loading = false;
+      skip:this.data.pager.limit*this.data.pager.pageIndex,
-      this.data.pager.loadAll = true;
+      limit:this.data.pager.limit
+    }).then((data)=>{
+
+      if(this.data.pager.pageIndex==0){
+        this.data.list = data.items;
+      }else{
+        this.data.list = this.data.list.concat(data.items);
+      }
       this.data.pager.refreshTrigger = false;
+      this.data.pager.loading = false;
+      this.data.pager.pageIndex++;
+      if(data.items.length<this.data.pager.limit){
+        this.data.pager.loadAll = true;
+      }
+
       this.setData({
-        list:data.items,
+        list:this.data.list,
         pager:this.data.pager
       })
     }).catch(()=>{

pages/my/firend/index.wxss

@@ -32,6 +32,9 @@
 .firend-list .item .status{
   color:var(--main-color)
 }
+.firend-list .item .status.un{
+  color:#999;
+}
 
 .list-empty{
   padding-top:480rpx;

pages/my/index/index.js

@@ -56,9 +56,6 @@ Page({
     wx.navigateTo({
       url: `/pages/browser/index?url=${encodeURIComponent(url)}`,
     })
-  },
-  shareFriend(){
-    
   },
   showQRCode(){
     userApi.shareQRCode().then((data)=>{

pages/my/index/index.wxml

@@ -7,7 +7,10 @@
       <view bind:tap="navToSetting">
         <image class="avatar" src="{{userInfo.optimized_avatar||'/assets/icon/my/avatar.png'}}"/>
       </view>
-      <view class="name">{{userInfo.nickname}}</view>
+      <view class="name">
+        <view>{{userInfo.nickname}}</view>
+        <view class="phone">{{userInfo.phone}}</view>
+      </view>
       <image src="/assets/icon/help/qrcode.png" class="qrcode" bind:tap="showQRCode" 
         wx:if="{{userInfo.userid}}"/>
     </view>
@@ -20,7 +23,7 @@
     </view>
     <view class="item" bind:tap="goToMoney">
       <view class="value">{{userInfo.points||0}}</view>
-      <view class="key">蜂蜜(克)</view>
+      <view class="key">积分</view>
     </view>
   </view>
 
@@ -32,20 +35,20 @@
       <view class="cell-bd">
         <view>
           <view>邀请好友下单</view>
-          <view class="spec">邀请好友领券下单，自己再得1张跑腿券</view>
+          <view class="spec">邀请好友领券下单，自己再得1张配送券</view>
         </view>
       </view>
       <view class="cell-ft"></view>
     </navigator>
   </view> -->
-  <button class="invite-cell" bind:tap="shareFriend" open-type="share">
+  <navigator url="/pages/my/promation/share/index" class="invite-cell">
     <view class="title">
       <image class="icon" src="/assets/icon/my/share@2x.png"></image>
       <view class="text">{{appConfig.share_button_title}}</view>
       <view class="right-arrow"></view>
     </view>
     <view class="sub-title">{{appConfig.share_button_desc}}</view>
-  </button>
+  </navigator>
   <view class="cells cells-access">
     <navigator url="/pages/my/firend/index" class="cell" hover-class="cell-active">
       <view class="cell-hd">

pages/my/index/index.wxss

@@ -29,6 +29,12 @@
   flex:1;
   margin-left:30rpx;
 }
+.user-info .content .phone{
+  margin-top:18rpx;
+  font-size: 30rpx;
+  font-weight: normal;
+  color: #333;
+}
 .user-info .content .qrcode{
   width:56rpx;height:56rpx;
 }

pages/my/money/index.json

@@ -2,5 +2,5 @@
   "usingComponents": {
     "list-view":"/components/listView"
   },
-  "navigationBarTitleText": "蜂蜜"
+  "navigationBarTitleText": "积分"
 }

pages/my/money/index.wxml

@@ -1,6 +1,6 @@
 <view class="custom-scroll-view">
   <view class="consume">
-    <view class="title">蜂蜜 (克)</view>
+    <view class="title">积分</view>
     <view class="point">{{userInfo.points}}</view>
     <view class="tips">取快递自动抵扣</view>
   </view>
@@ -19,7 +19,7 @@
 
     <view class="list-empty" wx:if="{{list.length==0&&pager.loadAll}}">
       <image class="icon" src="/assets/icon/shop/point-empty@2x.png"/>
-      <view class="sub-title">暂无蜂蜜</view>
+      <view class="sub-title">暂无积分</view>
     </view>
   </list-view>
 </view>

pages/my/promation/activities/index.js

@@ -16,7 +16,9 @@ Page({
 
 
     isShowModal:false,
-    errorMsg:''
+    errorMsg:'',
+
+    canReceive:false
   },
 
   /**
@@ -43,26 +45,22 @@ Page({
       getting:true
     })
     commonApi.activities.receive(this.data.activityId).then((data)=>{
-      wx.showToast({
-        title: '领取成功',
-      });
       this.setData({
         isShowModal:true,
+        getting:false,
         reveivedSuccess:true,
         errorMsg:'恭喜您已领取成功！'
       })
     }).catch((e)=>{
       this.setData({
         isShowModal:true,
+        getting:false,
         errorMsg:e.message||'领取错误'
       })
-      this.setData({
-        getting:false
-      })
     })
   },
   navToIndex(){
-    if(this.data.hasProduct){
+    if(this.data.hasProduct&&this.data.canReceive){
       wx.reLaunch({
         url: '/pages/my/coupon/index',
       })
@@ -97,6 +95,7 @@ Page({
       });
       return userApi.coupon.check(this.data.activityId);
     }).then((data)=>{
+      this.data.canReceive = data.can_receive;
       if(!data.can_receive){
         this.setData({
           isShowModal:true,

pages/my/promation/activities/index.wxml

@@ -26,7 +26,7 @@
   <button disabled="{{getting}}" loading="{{getting}}" type="primary" 
     class="button get" bind:tap="getActivity">一键领取</button>
 </view>
-<image src="/assets/imgs/login/main.png" class="bottom-img"/>
+<image src="/assets/imgs/login/main.png" class="bottom-img" mode="widthFix"/>
 
 <modal-view titleText="{{errorMsg}}" 
   okButtonText="{{hasProduct&&reveivedSuccess?'去兑换':'回到首页'}}" 

pages/my/promation/activities/index.wxss

@@ -62,8 +62,7 @@ page{
 .bottom-img{
   position: fixed;
   bottom:0;
-  width:500rpx;
+  width:70vw;
-  height:540rpx;
+  left:15vw;
-  left:calc(50vw - 250rpx);
   z-index: 0;
 }

pages/my/promation/share/index.js

@@ -0,0 +1,66 @@
+// pages/my/promation/share/index.js
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})

pages/my/promation/share/index.json

@@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "navigationBarTitleText": "宠粉行动"
+}

pages/my/promation/share/index.wxml

@@ -0,0 +1,77 @@
+<scroll-view scroll-y class="scroll-view">
+  <view class="scroll-view-top-margin"></view>
+  <view class="logo-area">
+    <image src="/assets/icon/my/logo.png" class="logo"/>
+  </view>
+  <image class="share-title" src="/assets/imgs/share/share-title.png" mode="widthFix"/>
+
+  <view class="main">
+    <view class="head">奖励规则</view>
+    <view class="m-item large">
+      <view class="left">
+        <image class="icon" src="/assets/imgs/share/icon1.png"/>
+      </view>
+      <view class="right">
+        <view class="title">好友首单奖励</view>
+        <view class="sub-title">
+          好友注册并完成首单，您将获得<label class="point">30积分</label>奖励
+        </view>
+      </view>
+    </view>
+    <view class="m-item large">
+      <view class="left">
+        <image class="icon" src="/assets/imgs/share/icon1.png"/>
+      </view>
+      <view class="right">
+        <view class="title">好友后续订单</view>
+        <view class="sub-title">
+           好友每完成后续订单，您将获得<label class="point">3积分</label>奖励
+        </view>
+      </view>
+    </view>
+    <view class="spliter"></view>
+    <view class="m-item small">
+      <view class="left">
+        <image class="icon" src="/assets/imgs/share/icon1.png"/>
+      </view>
+      <view class="right">
+        <view class="sub-title">
+          积分可用于抵扣配送费，<label class="point">10积分=1元</label>
+        </view>
+      </view>
+    </view>
+    <view class="m-item small">
+      <view class="left">
+        <image class="icon" src="/assets/imgs/share/icon1.png"/>
+      </view>
+      <view class="right">
+        <view class="sub-title">
+          积分长期有效，无需担心过期
+        </view>
+      </view>
+    </view>
+
+    <button type="primary" class="btn-share" open-type="share">
+      <image src="/assets/imgs/share/share.png" class="icon"/>
+      <label>立即邀请好友</label>
+    </button>
+
+    <view class="step-area">
+      <view class="title">邀请步骤</view>
+      <view class="steps">
+        <view class="item">
+          <view class="icon">1</view>
+          <view class="text">分享给好友</view>
+        </view>
+        <view class="item">
+          <view class="icon">2</view>
+          <view class="text">好友下单完成</view>
+        </view>
+        <view class="item">
+          <view class="icon">3</view>
+          <view class="text">获得积分奖励</view>
+        </view>
+      </view>
+    </view>
+  </view>
+</scroll-view>

pages/my/promation/share/index.wxss

@@ -0,0 +1,152 @@
+page{
+  background-color:var(--main-color);
+}
+.scroll-view{
+  height:100vh;
+}
+
+.logo-area{
+  background-color: rgba(237, 181, 0, 1);
+  border-radius: 50%;
+  width:132rpx;height:132rpx;
+  margin:70rpx auto 0 auto;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.logo-area .logo{
+  width:84rpx;height:84rpx;
+}
+.share-title{
+  width:512rpx;
+  margin:36rpx auto 0 auto;
+  display: block;
+}
+
+.main{
+  background-color: #fff;
+  border-radius: 18rpx;
+  margin:40rpx 24rpx;
+  padding:40rpx 24rpx;
+  box-shadow: 0px 3px 6px 1px rgba(0, 0, 0, 0.1);
+}
+.main .head{
+  font-size: 36rpx;
+  display: flex;
+  gap: 24rpx;
+  align-items: center;
+  color: var(--main-color);
+}
+.main .head::before{
+  content: '';
+  background-color: var(--main-color);
+  border-radius: 18rpx;
+  width:8rpx;height:32rpx;
+}
+
+.main .m-item{
+  display: flex;
+  align-items: center;
+  margin:50rpx 0 60rpx 0;
+}
+.main .m-item.small{
+  margin:30rpx 0;
+}
+.main .m-item .left{
+  width:70rpx;height:70rpx;
+  background-color: rgba(255, 246, 217, 1);
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.main .m-item.small .left{
+  width:52rpx;height:52rpx;
+}
+.main .m-item .right{
+  margin-left:24rpx;
+  display: flex;
+  flex-direction: column;
+  gap: 20rpx;
+}
+.main .m-item .icon{
+  width:40rpx;height:40rpx;
+}
+.main .m-item .title{
+  font-weight: 500;
+}
+.main .m-item .sub-title{
+  font-size:26rpx;
+  color: rgba(85, 85, 85, 1);
+}
+.main .m-item .point{
+  color: var(--main-color);
+  font-weight: 600;
+  margin:0 12rpx;
+}
+
+.spliter{
+  position: relative;
+  margin:64rpx 0 60rpx 0;
+}
+.spliter::before{
+  content:'积分说明';
+  position: absolute;
+  top:-14rpx;left:50%;
+  margin-left: -78rpx;
+  padding:0 22rpx;
+  font-size: 28rpx;
+  background-color: #fff;
+}
+
+.btn-share{
+  border-radius: 60rpx;
+  margin:60rpx 70rpx 0 70rpx!important;
+  line-height: 1;
+}
+
+.step-area{
+  background-color: rgba(255, 246, 217, 1);
+  border-radius: 18rpx;
+  padding:30rpx 24rpx 34rpx 24rpx;
+  margin-top:60rpx;
+}
+.step-area .title{
+  color: var(--main-color);
+  text-align: center;
+}
+.step-area .steps{
+  display: flex;
+  font-size: 22rpx;
+  margin-top:34rpx;
+}
+.step-area .steps .item{
+  display: flex;
+  flex-direction: column;
+  gap: 30rpx;
+  flex: 1;
+  align-items: center;
+  position: relative;
+}
+.step-area .steps .icon{
+  width:60rpx;height:60rpx;
+  background-color: rgba(237, 181, 0, 1);
+  font-size: 36rpx;
+  font-weight: bold;
+  border-radius: 50%;
+  color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.step-area .steps .item::after{
+  background:transparent url(data:image/svg+xml,%3Csvg%20t%3D%221743574928938%22%20class%3D%22icon%22%20viewBox%3D%220%200%201024%201024%22%20version%3D%221.1%22%20xmlns%3D%22http%3A//www.w3.org/2000/svg%22%20p-id%3D%2245741%22%20width%3D%22128%22%20height%3D%22128%22%3E%3Cpath%20d%3D%22M456.99072%20608.60416l-272.9984-28.73344a68.23936%2068.23936%200%200%201%200-135.74144l272.9984-28.73344A61.44%2061.44%200%200%200%20512%20354.28352v-132.15744C512%20201.23648%20529.73568%20184.32%20551.60832%20184.32c10.15808%200%2019.94752%203.72736%2027.32032%2010.4448L882.688%20470.91712a54.90688%2054.90688%200%200%201%200%2082.1248L578.92864%20829.25568a40.96%2040.96%200%200%201-56.0128-1.31072A36.90496%2036.90496%200%200%201%20512%20801.87392V669.696a61.44%2061.44%200%200%200-55.00928-61.11232z%22%20p-id%3D%2245742%22%20fill%3D%22%23EDB500%22%3E%3C/path%3E%3C/svg%3E);
+  content: '';
+  position: absolute;
+  width:40rpx;height:40rpx;
+  right: -20rpx;top:10rpx;
+  background-size: 100%;
+}
+.step-area .steps .item:last-child::after{
+  display: none;
+}

pages/my/promation/wx-group/index.wxml

@@ -2,7 +2,9 @@
   <view class="fixed">
     <view class="top-bg">
       <nav-bar back black/>
-      <image src="/assets/imgs/login/main.png" class="image"/>
+      <view class="img-wrapper">
+        <image src="/assets/imgs/login/main.png" class="image" mode="widthFix"/>
+      </view>
       <view class="hive"></view>
     </view>
     <view class="community-info">

pages/my/promation/wx-group/index.wxss

@@ -11,9 +11,12 @@ page{
   text-align: center;
   position: relative;
 }
-.top-bg .image{
+.top-bg .img-wrapper{
-  width:448rpx;
   height:480rpx;
+  overflow: hidden;
+}
+.top-bg .image{
+  width:500rpx;
   position: relative;
   z-index: 1;
 }

pages/my/setting/index/index.js

@@ -110,6 +110,11 @@ Page({
       url: `/pages/browser/index?url=${encodeURIComponent(this.data.appConfig.url_delivery_contract)}`,
     })
   },
+  navToFee(){
+    wx.navigateTo({
+      url: `/pages/browser/index?url=${encodeURIComponent(this.data.appConfig.url_addition_fee_policy)}`,
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/my/setting/index/index.wxml

@@ -27,6 +27,10 @@
     <view class="cell-bd">配送服务协议</view>
     <view class="cell-ft"></view>
   </view>
+  <view class="cell" bind:tap="navToFee">
+    <view class="cell-bd">加价收费标准</view>
+    <view class="cell-ft"></view>
+  </view>
 </view>
 <button type="default" class="logout-btn" bind:tap="logout">退出登录</button>
 

pages/order/detail/index.wxml

@@ -45,10 +45,10 @@
             期望送达<label class="time">{{orderDetail.delivery_time}}</label>
         </view>
       </view>
-      <block wx:if="{{orderDetail.pickup_images&&orderDetail.pickup_images.length>0}}">
+      <block wx:if="{{false&&orderDetail.pickup_images&&orderDetail.pickup_images.length>0}}">
         <view class="spliter"></view>
         <view class="package">
-          <view class="p-title">图片取件 共 {{orderDetail.pickup_images_count}} 件包裹</view>
+          <view class="p-title">原始图片信息</view>
           <view class="img-list">
             <image class="item" src="{{item}}" wx:for="{{orderDetail.pickup_images}}" 
               wx:key="index" bind:tap="viewPackageImg" data-item="{{item}}"/>
@@ -58,7 +58,11 @@
       <block wx:for="{{orderDetail.packages}}" wx:key="index">
         <view class="spliter"></view>
         <view class="package">
-          <view class="p-title">{{item.station_name}} 共{{item.pickup_codes.length}}件包裹</view>
+          <view class="p-title">
+            <view>{{item.station_name}} 共{{item.pickup_codes.length}}件包裹</view>
+            <image wx:if="{{!item.station_id}}" src="/assets/icon/help/images.png" class="img-icon"
+              bind:tap="viewPackageImg" data-item="{{orderDetail.pickup_images}}"/>
+          </view>
           <view class="code-list">
             <view class="item" wx:for="{{item.pickup_codes}}" 
               wx:for-item="package" wx:for-index="pIndex" wx:key="pIndex">{{package}}</view>
@@ -120,7 +124,7 @@
         </view>
       </view>
       <view class="kv" wx:if="{{orderDetail.point_discount_amount>0}}">
-        <view class="key">蜂蜜抵扣</view>
+        <view class="key">积分抵扣</view>
         <view class="value">
           <label class="money minus money-normal">
             {{orderDetail.point_discount_amount}}
@@ -145,7 +149,6 @@
         <view class="key">支付金额</view>
         <view class="value">
           <label class="money">{{orderDetail.final_amount}}</label>
-          <view class="tag">先享后付</view>
         </view>
       </view>
     </view>
@@ -153,10 +156,10 @@
   </scroll-view>
   <view class="bottom-bar-v2">
     <view class="btns">
-      <button class="button button1" plain size="mini" bind:tap="showCancelModal"
+      <button class="button button1" plain size="mini" bind:tap="showCancelModal" 
-        wx:if="{{orderDetail.status==orderStatus.created}}" loading="{{cancelling}}" 
+        wx:if="{{orderDetail.status==orderStatus.created||orderDetail.status==orderStatus.unpaid}}" 
-        disabled="{{cancelling}}">取消订单</button>
+        loading="{{cancelling}}" disabled="{{cancelling}}">取消订单</button>
-      <button class="pay" type="primary" wx:if="{{orderDetail.status==orderStatus.unpaid}}" 
+      <button class="button pay" type="primary" wx:if="{{orderDetail.status==orderStatus.unpaid}}" 
           bind:tap="pay">去支付</button>
       <block wx:else>
         <button class="button button1" plain size="mini" bind:tap="orderAgain"
@@ -169,6 +172,6 @@
 </view>
 
 
-<merchant-order id="merchantOrderComponent" bind:paySuccess="paySuccess" wx:if="{{orderDetail.status==orderStatus.unpaid}}"/>
+<merchant-order id="merchantOrderComponent" bind:paySuccess="paySuccess"/>
 <modal-view titleText="你确定取消此订单吗？" model:show="{{isShowCancelView}}" 
-  bind:ok="cancelOrder" wx:if="{{orderDetail.status==orderStatus.created}}"></modal-view>
+  bind:ok="cancelOrder" wx:if="{{isShowCancelView}}"></modal-view>

pages/order/detail/index.wxss

@@ -54,7 +54,7 @@
   font-weight: 500;
 }
 .page-container .spliter{
-  margin:24rpx 0 40rpx 0;
+  margin:24rpx 0 30rpx 0;
 }
 .sender .info{
   display: flex;
@@ -103,6 +103,14 @@
 .package-info .package .p-title{
   font-size: 30rpx;
   color: #888888;
+  display: flex;
+  justify-content:space-between;
+  align-items: center;
+  line-height: 50rpx;
+}
+.package-info .package .img-icon{
+  padding:10rpx;
+  width:40rpx;height:40rpx;
 }
 .package-info .package .code-list{
   font-size: 34rpx;
@@ -110,7 +118,7 @@
   flex-wrap: wrap;
   row-gap: 30rpx;
   column-gap: 84rpx;
-  margin-top: 30rpx;
+  margin-top: 20rpx;
   font-weight: bold;
 }
 .package-info .package .img-list{
@@ -180,7 +188,7 @@
   justify-content:flex-end;
 }
 .bottom-bar-v2 .pay{
-  flex:1
+  /* flex:1 */
 }
 .bottom-bar-v2 .button{
   line-height: 72rpx;

pages/order/index/index.js

@@ -75,8 +75,8 @@ Page({
   onLoad(options) {
     app.globalData.needRefreshOrderList = false;
     if(app.globalData.accessToken){
-      this.pager.tab1.loading = false;
+      this.data.pager.tab1.loading = false;
-      this.pager.tab3.loading = false;
+      this.data.pager.tab3.loading = false;
 
       this.loadOrderList();
       this.loadMerchantOrderList();

pages/order/index/index.wxml

@@ -14,7 +14,7 @@
   </view> -->
   <!-- <swiper  style="height:{{scrollViewHeight*2}}rpx"> -->
 
-  <!--  跑腿列表   -->
+  <!--  配送列表   -->
   <!-- <swiper-item> -->
 
   <list-view class="order-list main" wx:if="{{tabIndex==0}}" 
@@ -80,7 +80,7 @@
         <view class="value kv-amount">-{{item.amount}}</view>
       </view>
       <view class="kv">
-        <view class="key">赠送蜂蜜</view>
+        <view class="key">赠送积分</view>
         <view class="value kv-point">+{{item.gift_points}}</view>
       </view>
       <view class="kv">

pages/order/markup/index.js

@@ -1,4 +1,6 @@
 import userApi from '../../../api/user';
+const app = getApp();
+
 Page({
 
   /**
@@ -10,7 +12,9 @@ Page({
     cancelling:false,
     isShowCancelView:false,
     isShowAcceptView:false,
-    refresherTriggered:false
+    refresherTriggered:false,
+    
+    appConfig:{}
   },
 
   /**
@@ -19,6 +23,11 @@ Page({
   onLoad(options) {
     this.data.orderId = options.orderid;
     this.getDetail();
+    app.getAppConfig().then((data)=>{
+      this.setData({
+        appConfig:data
+      })
+    })
   },
   getDetail(){
     this.setData({
@@ -37,16 +46,18 @@ Page({
     })
   },
   acceptRequest(){
-    userApi.order.markup.accept(this.data.applyDetail.id).then((data)=>{
+    const merchantPay = this.selectComponent('#merchantPay');
-      wx.navigateBack({
+    merchantPay.createPayment(this.data.applyDetail.fee_order_id,true);
-        success(){
+  },
-          wx.showToast({
+  paySuccess(){
-            title: '加价成功',
+    wx.navigateBack({
-          })
+      success(){
-        }
+        wx.showToast({
-      });
+          title: '加价已同意',
-      this.updatePrePage();
+        })
-    })
+      }
+    });
+    this.updatePrePage();
   },
   
   cancel(){
@@ -85,6 +96,11 @@ Page({
       current:event.currentTarget.dataset.item
     })
   },
+  navToFee(){
+    wx.navigateTo({
+      url: `/pages/browser/index?url=${encodeURIComponent(this.data.appConfig.url_addition_fee_policy)}`,
+    })
+  },
   /**
    * 生命周期函数--监听页面初次渲染完成
    */

pages/order/markup/index.json

@@ -1,5 +1,7 @@
 {
   "usingComponents": {
-    "modal-view":"/components/modalView"
+    "modal-view":"/components/modalView",
-  }
+    "merchant-order":"/components/merchantOrder"
+  },
+  "navigationBarTitleText": "订单加价申请"
 }

pages/order/markup/index.wxml

@@ -2,7 +2,7 @@
   <scroll-view class="main" bindrefresherrefresh="getDetail" refresher-enabled 
     refresher-triggered="{{refresherTriggered}}" scroll-y>
     <view class="scroll-view-top-margin"></view>
-    <view class="page-container right-arrow order-info">
+    <view class="page-container order-info">
       <view>
         <label>订单编号</label>
         <label class="value">{{applyDetail.orderid}}</label>
@@ -13,7 +13,7 @@
       </view>
     </view>
     <view class="page-container delivery-man">
-      <view class="head">跑腿员</view>
+      <view class="head">配送员</view>
       <view class="spliter"></view>
       <view class="info">
         <image class="avatar" src="{{applyDetail.deliveryman_avatar||'/assets/icon/my/avatar.png'}}"/>
@@ -28,11 +28,15 @@
       <view class="head">加价原因</view>
       <view class="spliter"></view>
       <view class="reason">{{applyDetail.reason}}</view>
-      <view class="imgs">
+      <view class="imgs" wx:if="{{applyDetail.photo_urls&&applyDetail.photo_urls.length>0}}">
         <image class="item" src="{{item}}" wx:for="{{applyDetail.photo_urls}}" 
           wx:key="index" data-item="{{item}}" bind:tap="viewImage"/>
       </view>
     </view>
+    <view class="page-container markup-money" bind:tap="navToFee">
+      <view>加价收费标准</view>
+      <view class="right-arrow"></view>
+    </view>
     <view class="page-container markup-money">
       <view>加价金额</view>
       <view class="value">{{applyDetail.additional_fee_amount}}元</view>
@@ -54,4 +58,6 @@
 
 
 <modal-view titleText="你确定同意此次加价吗？" wx:if="{{isShowAcceptView}}" 
-  model:show="{{isShowAcceptView}}" bind:ok="acceptRequest"></modal-view>
+  model:show="{{isShowAcceptView}}" bind:ok="acceptRequest"></modal-view>
+
+<merchant-order id="merchantPay" bind:paySuccess="paySuccess"/>

pages/shop/bill/index.wxml

@@ -5,7 +5,7 @@
       bindinput="inputAmount" model:value="{{amount}}"/>
   </view>
   <view class="bottom">
-    <label class="key">蜂蜜 (克)</label>
+    <label class="key">积分</label>
     <label class="value">{{checkedAmount.gift_points||0}}</label>
   </view>
 </view>

pages/shop/detail/index.wxml

@@ -80,7 +80,7 @@
 
 <view class="bottom-bar float">
   <view class="money">{{detail.sale_price}}</view>
-  <view class="tips">赠蜂蜜{{detail.gift_points}}克</view>
+  <view class="tips">赠积分{{detail.gift_points}}</view>
   <button type="primary" class="button" bind:tap="buy" loading="{{buying}}">立即下单</button>
 </view>
 

pages/shop/index/index.wxml

@@ -26,7 +26,7 @@
       </view>
       <view class="desc-line">
         <view class="tag">小时达</view>
-        <view class="desc">已售100丨赠蜂蜜丨自配送</view>
+        <view class="desc">已售100丨赠积分丨自配送</view>
         <view class="promotion">新人专享</view>
       </view>
     </navigator>

pages/shop/success/index.wxml

@@ -1,6 +1,6 @@
 <view class="success">
   <icon class="icon" type="success" size="120rpx" color="#FFC300"/>
   <view class="text">下单成功</view>
-  <view class="tips">交易完成后，赠送蜂蜜赠哟～</view>
+  <view class="tips">交易完成后，赠送积分赠哟～</view>
   <button class="button" plain bind:tap="back">前往查看订单</button>
 </view>