配送地图

components/loginPopup/loginPopup.wxml

@@ -1,7 +1,7 @@
 <!-- 提示登录弹框 -->
 <view class="login-popup" wx:if="{{!isAuthInfo}}">
   <view class="log-pop-main">
-    <view class="log-pop-tit">欢迎来到海马购商城</view>
+    <view class="log-pop-tit">欢迎来到市民请集合</view>
     <view class="log-pop-msg">请授权登录，获得完整购物体验</view>
     <view class="log-pop-btns">
       <button class="log-pop-no" bindtap="hidePopup">取消</button>

packageMemberIntegral/pages/buyVip/buyVip.json

@@ -1,6 +1,6 @@
 {
   "usingComponents": {},
   "navigationBarBackgroundColor": "#ffffff",
-  "navigationBarTitleText": "海马购商城-会员中心",
+  "navigationBarTitleText": "市民请集合-会员中心",
   "navigationBarTextStyle": "black"
 }

pages/DetailsOfRefund/DetailsOfRefund.wxml

@@ -7,7 +7,7 @@
     <view class="result">
     <view class="title-box">
       <view class="title small">退款金额</view>
-      <view class="price">￥21</view>
+      <view class="price">￥{{goodsTotal}}</view>
     </view>
       <view class="desc">申请通过后，将退回至原账户</view>
     </view>
@@ -68,7 +68,7 @@
             <view class="price">单价：￥{{item.price}}</view>
           </view>
           <view class="price-box">
-            <view class="price">￥{{item.productCount*item.price}}</view>
+            <view class="price">￥{{((item.productCount*100)*(item.price*100))/10000}}</view>
             <view class="num">x{{item.productCount}}</view>
           </view>
         </view>

pages/afterSales/afterSales.js

@@ -98,6 +98,8 @@ Page({
    */
   applyAgain: function (e) {
     let refundId = e.currentTarget.dataset.refundid
+    let ordernum = e.currentTarget.dataset.ordernum
+    
     var item = {}
       item.orderNumber = this.data.orderNumber;
       item.actualTotal = this.data.actualTotal;
@@ -110,7 +112,7 @@ Page({
       wx.setStorageSync("refundItem", item);
 
     wx.redirectTo({ //通过wx.redirectTo实现跳转（关闭当前页面，跳转到应用内某个页面）
-      url: '/pages/applyRefund/applyRefund?refundId=' + refundId,
+      url: `/pages/applyRefund/applyRefund?refundId=${refundId}&orderNumber=${ordernum}` ,
     })
 
   },

pages/afterSales/afterSales.wxml

@@ -65,9 +65,9 @@
       <view class="btn-box" wx:if="{{item.returnMoneySts == 10}}">
         <view class="cancel-btn" data-refundSn="{{item.refundSn}}" bindtap="cancelApplication">取消申请</view>
       </view>
-      <!-- <view class="btn-box" wx:if="{{item.returnMoneySts == 40}}">
-        <view class="cancel-btn" data-refundId="{{item.refundId}}" bindtap="applyAgain">再次申请</view>
-      </view> -->
+      <view class="btn-box" wx:if="{{item.returnMoneySts == 40}}">
+        <view class="cancel-btn" data-refundId="{{item.refundId}}" data-ordernum="{{item.orderNumber}}" bindtap="applyAgain">再次申请</view>
+      </view>
       
     </view>
 

pages/applyRefund/applyRefund.js

@@ -41,24 +41,29 @@ Page({
    */
   onLoad(options) {
     let refundId = options.refundId || 0
-    var refundItem = wx.getStorageSync("refundItem");
-    console.log('拿到缓存里的订单项数据refundItem:',refundItem)
-    refundItem.orderItemDtos.forEach(item=>{
-      item.num = 1
-      item.checked = true
-    })
-    this.setData({
-      refundId,
-      refundItem: refundItem,
-      orderNumber: refundItem.orderNumber,
-      goodsNum: refundItem.prodCount,
-      actualTotal: refundItem.actualTotal,  //总额
-      isLastProd: refundItem.isLastProd,  //是否最后一样商品
-      addTransfee: refundItem.addTransfee, //只有一件商品可以退运费
-      orderScore: refundItem.useScore // 单个退积分
-    })
-    this.totalPrice()
-    this.checkAll()
+    var refundItem
+    if(refundId){//再次申请
+      this.loadOrderDetail(options.orderNumber,refundId)
+    }else{
+      refundItem = wx.getStorageSync("refundItem");
+      console.log('拿到缓存里的订单项数据refundItem:',refundItem)
+      refundItem.orderItemDtos.forEach(item=>{
+        item.num = 1
+        item.checked = true
+      })
+      this.setData({
+        refundId,
+        refundItem: refundItem,
+        orderNumber: refundItem.orderNumber,
+        goodsNum: refundItem.prodCount,
+        actualTotal: refundItem.actualTotal,  //总额
+        isLastProd: refundItem.isLastProd,  //是否最后一样商品
+        addTransfee: refundItem.addTransfee, //只有一件商品可以退运费
+        orderScore: refundItem.useScore // 单个退积分
+      })
+      this.totalPrice()
+      this.checkAll()
+    }
   },
   // 实时监听输入
   onInput: function(e) {
@@ -66,6 +71,42 @@ Page({
     this.setData({
       buyerDesc: e.detail.value
     });
+  },
+  /**
+   * 加载订单数据
+   */
+  loadOrderDetail: function(orderNumber,refundId) {
+    var ths = this;
+    wx.showLoading();
+    //加载订单详情
+    var params = {
+      url: "/p/myOrder/orderDetail",
+      method: "GET",
+      data: {
+        orderNumber
+      },
+      callBack: function(res) {
+        res.orderItemDtos.forEach(item=>{
+        item.num = 1
+        item.checked = true
+      })
+      wx.hideLoading();
+      ths.setData({
+        refundId,
+        refundItem: res,
+        orderNumber,
+        goodsNum: res.prodCount,
+        actualTotal: res.actualTotal,  //总额
+        isLastProd: res.isLastProd,  //是否最后一样商品
+        addTransfee: res.addTransfee, //只有一件商品可以退运费
+        orderScore: res.useScore // 单个退积分
+      })
+      ths.totalPrice()
+      ths.checkAll()
+      }
+    };
+    http.request(params);
+
   },
    /**
    * 提交退款
@@ -139,6 +180,12 @@ Page({
       data,
       callBack: (res) => {
         wx.hideLoading();
+        if(res.code == 500){
+          return wx.showToast({
+            title: res.msg,
+            icon:'none'
+          })
+        }
         // 去到我的退款订单页面
         wx.redirectTo({
           url: '/pages/afterSales/afterSales',
@@ -194,7 +241,7 @@ Page({
    * 上传图片
    */
   getUploadImg: function(e) {
-    console.log(this.data.photoFiles);
+    console.log('上传图片开始');
     if(this.data.photoFiles.length == 5){
       return wx.showToast({
         title: '最多可上传5张图片',
@@ -207,6 +254,7 @@ Page({
       sourceType: ['album', 'camera'],
       maxDuration: 30,
       success: function(res) {
+        console.log('选择图片完成：',res);
         // 图片的本地临时文件路径列表
         var tempFilePaths = res.tempFiles[0].tempFilePath;
         wx.showLoading({
@@ -217,6 +265,7 @@ Page({
           filePath: tempFilePaths,
           name: 'file',
           callBack: function(res2) {
+            console.log('上传接口：',res2);
             wx.hideLoading();
             var img = {};
             img.path = JSON.parse(res2).filePath;
@@ -295,7 +344,7 @@ Page({
      let num = 0
       this.data.refundItem.orderItemDtos.forEach(item=>{
         if(item.checked){
-          total+=item.price*item.num
+          total+=((item.price*100)*(item.num*100))/10000
           num+=item.num
         }
       })

pages/applyRefund/applyRefund.wxml

@@ -45,7 +45,7 @@
             <view class="price">单价：￥{{item.price}}</view>
           </view>
           <view class="price-box">
-            <view class="price">￥{{item.price*item.num}}</view>
+            <view class="price">￥{{((item.price*100)*(item.num*100))/10000}}</view>
             <view class="num-box">
               <view class="btn" bind:tap="changeNum" data-index="{{index}}" data-num="{{-1}}">-</view>
               <view class="num">{{item.num}}</view>

pages/category/category.wxss

@@ -338,6 +338,7 @@ scroll-view ::-webkit-scrollbar {
   margin: 20rpx 0;
 }
 .rightcontent  .product-item .info{
+  flex: 1;
   display: flex;
   flex-direction: column;
   justify-content: space-between;

pages/index/index.wxml

@@ -2,7 +2,7 @@
 <view class="container" style="padding-top: {{pageTopHeight}}px;">
   <navbar>
     <view class="top-navbar-box" wx:if="{{gapTop==1}}" style="opacity: {{titleOpacity}};">
-      <!-- <view class="shop-title">海马购</view> -->
+      <!-- <view class="shop-title">市民请集合</view> -->
       <view class="shop-info">
         <!-- <view>百货超市</view>| -->
         <view bindtap="toLocationPage" class="shop-address-info">
@@ -60,13 +60,19 @@
   <!-- <view class="swiper-grid-box" wx:if="{{categoryList1.length>0}}"> -->
   <view class="swiper-grid-box" wx:if="{{categoryList.length>0}}">
   <view class="grid-box">
-    <van-grid border="{{false}}" column-num="5">
+    <!-- <van-grid border="{{false}}" column-num="5">
           <van-grid-item class="my-grid-item" use-slot bind:click="selectMenu" wx:for="{{categoryList}}" wx:key="categoryId" data-pic="{{item.pic}}" data-itemid="{{item.categoryId}}" data-index="{{index}}" data-categories="{{item.categories}}" data-categoryName="{{item.categoryName}}" badge="应季水果">
             <image class="swiper-grid-image" src="{{item.icon}}" />
             <text class="swiper-grid-text">{{item.categoryName}}</text>
             <view class="label" wx:if="{{item.label}}">{{'应季果蔬'||item.label}}</view>
           </van-grid-item>
-        </van-grid>
+        </van-grid> -->
+
+          <view class="my-grid-item" use-slot bind:tap="selectMenu" wx:for="{{categoryList}}" wx:key="categoryId" data-pic="{{item.pic}}" data-itemid="{{item.categoryId}}" data-index="{{index}}" data-categories="{{item.categories}}" data-categoryName="{{item.categoryName}}" badge="应季水果">
+            <image class="swiper-grid-image" src="{{item.icon}}" />
+            <text class="swiper-grid-text">{{item.categoryName}}</text>
+            <view class="label" wx:if="{{item.label}}">{{'应季果蔬'||item.label}}</view>
+          </view>
   </view>
     
     <swiper class="swiper-grid" wx-if="{{categoryList1.length>0}}" indicator-dots="true" indicator-active-color="#FF941A" bindchange="menuSwiper">
@@ -239,7 +245,7 @@
       <view style="height: 500rpx;">
         <van-empty image="search" description="附近暂无可配送门店" />
       </view>
-      <view class="reset-localization" bindtap="toLocationPage">定位不准确？<text style="color: rgb(40,120,255);">点击手动定位</text></view>
+      <!-- <view class="reset-localization" bindtap="toLocationPage">定位不准确？<text style="color: rgb(40,120,255);">点击手动定位</text></view> -->
     </block>
     <block wx:if="{{hotSalesList.length>0}}">
       <view class="tips" wx:if="{{isAll}}">已经到底咯~</view>

pages/index/index.wxss

@@ -312,9 +312,18 @@ swiper.pic-swiper .banner {
 .swiper-grid-box .grid-box .van-grid{
   border-radius: 16rpx;
 }
+.grid-box{
+  display: grid;
+  /* 列规则：5列等宽（1fr 代表"剩余空间等份分配"） */
+  grid-template-columns: repeat(5, 1fr);
+  /* 行列间距：10rpx（小程序常用 rpx 适配多端） */
+  gap: 16rpx;
+  /* 容器内边距：避免网格贴边 */
+  padding: 20rpx;
+}
 
 .grid-box,.swiper-grid{
-  padding-top: 20rpx;
+  /* padding-top: 20rpx; */
 }
 
 .swiper-grid {
@@ -325,6 +334,8 @@ swiper.pic-swiper .banner {
 }
 .my-grid-item{
   position: relative;
+  text-align: center;
+
 }
 .my-grid-item .van-grid-item__content {
   padding: 0rpx;
@@ -340,7 +351,7 @@ swiper.pic-swiper .banner {
   background: #FF5030;
   position: absolute;
   left: 50%;
-  top:16rpx;
+  top:0rpx;
   white-space: nowrap;
 }
 .swiper-grid-image{

pages/locationAdd/locationAdd.js

@@ -10,6 +10,7 @@ Page({
   data: {
     address: '',
     addressList: [],
+    nearShop:null,
     shopList:[]
   },
 
@@ -39,6 +40,7 @@ Page({
    */
   onShow() {
     this.getAddrList()
+    this.getshopList()
   },
   /**
    * 获取地址列表
@@ -65,13 +67,24 @@ Page({
   getshopList() {
     wx.showLoading();
     var params = {
-      url: "/p/shop/addrShop",
+      url: "/shop/addrShop",
       method: "GET",
-      data: {addrId:'',platform:1},
+      data: {
+        addrId:'',
+        lat: wx.getStorageSync('LATITUDE'),
+        lon: wx.getStorageSync('LONGITUDE'),
+        platform:1},
       callBack: (res) => {
-        // this.setData({
-        //   shopList: res
-        // });
+        if(res&&res.length){
+          let data = res
+          let nearShop = data.splice(0,1)[0]
+          console.log(nearShop,data);
+          this.setData({
+            nearShop,
+            shopList: data
+          });
+
+        }
         wx.hideLoading();
       }
     }
@@ -85,6 +98,27 @@ Page({
       url: '/pages/delivery-address/delivery-address'
     })
   },
+  /**
+   * 
+   * 选择店铺
+   */
+  chooseShop(e){
+    wx.setStorageSync('LATITUDE', e.currentTarget.dataset.item.lat)
+    wx.setStorageSync('LONGITUDE', e.currentTarget.dataset.item.lon)
+    this.getTxmap()
+    wx.setStorageSync('ADDRESS', e.currentTarget.dataset.item.addressName)
+        setTimeout(() => {
+          let pages = getCurrentPages();
+          let prevPage = pages[pages.length - 2]; //获取A页面
+          wx.navigateBack({
+            delta: 1,
+            success: function (e) { // 成功的回调
+              if (prevPage == undefined || prevPage == null) return;
+              prevPage.go_update(); // 调用A页面的方法, 并将值传过去
+            }
+          })
+        }, 500)
+  },
   /**
    * 设置默认
    */

pages/locationAdd/locationAdd.wxml

@@ -34,20 +34,20 @@
     </view>
 
     <view class="shop-list ">
-      <view class="near-shop box">
+      <view class="near-shop box" bind:tap="chooseShop" data-item="{{nearShop}}" wx:if="{{nearShop}}">
         <view class="desc">
           附近的门店
         </view>
         <view class="shop">
-          海马购超市（红街店）
+          {{nearShop.shopName}}
         </view>
         <view class="desc">
           以为您选择距离最近的可配送店
         </view>
       </view>
       <view class="box">
-        <view class="shop">
-          京东便利店（优品3店）
+        <view class="shop" bind:tap="chooseShop"  data-item="{{item}}" wx:for="{{shopList}}">
+          {{item.shopName}}
         </view>
       </view>
     </view>

pages/login/login.js

@@ -75,6 +75,9 @@ Page({
     })
   },
 
+  goback(){
+    wx.navigateBack()
+  },
   /**
    * 生命周期函数--监听页面加载
    */

pages/login/login.json

@@ -1,4 +1,4 @@
 {
   "usingComponents": {},
-  "navigationBarTitleText": "海马购商城"
+  "navigationBarTitleText": "市民请集合"
 }

pages/login/login.wxml

@@ -1,15 +1,16 @@
 <!--pages/login/login.wxml-->
 <view class="login-container" wx:if="{{!showBindTips}}">
   <view class="content">
-    <image src='http://img-test.gz-yami.com/mini/logo.jpg' class='c-logo'></image>
-    <view class="title">海马购精选</view>
-    <view class="msg">申请获得你的公开信息（昵称、头像等）</view>
+    <image src='../../images/logo.png' class='logo'></image>
+    <!-- <view class="title">市民请集合</view>
+    <view class="msg">申请获得你的公开信息（昵称、头像等）</view> -->
   </view>
   <view class="login-phone">
     <button class="authorized-btn" open-type="getPhoneNumber" bindgetphonenumber="getPhoneNumber">微信一键登录</button>
   </view>
   <view class="login-phone">
-    <button class="authorized-btn hole-btn" bindtap="toLogin">账号密码登录</button>
+    <button class="authorized-btn hole-btn" bindtap="goback">暂不登录</button>
+    <!-- <button class="authorized-btn hole-btn" bindtap="toLogin">账号密码登录</button> -->
   </view>
   <!-- <view class="login-bottom">
     <button class="authorized-btn bottom-btn" open-type="getUserInfo" bindgetuserinfo="bindGetUserInfo">微信登录</button>

pages/login/login.wxss

@@ -10,8 +10,7 @@ page {
   position: relative;
   height: 100%;
   width: 100%;
-  padding-top: 50%;
-  box-sizing: border-box;
+
 }
 image {
   display: block;
@@ -54,17 +53,20 @@ button::after{
   border: 0 !important;
 }
 .authorized-btn {
-  width: 88%;
   margin: 0 auto;
-  text-align: center;
-  background-color: #0ab906;
-  border: 1rpx solid #0ab906;
+  width: 702rpx;
+  height: 116rpx;
+  line-height: 116rpx;
+  background: #FF941A;
+  border-radius: 60rpx 60rpx 60rpx 60rpx;
   color: #fff;
-  border-radius: 6rpx;
-  font-size: 26rpx;
+  font-weight: bold;
+  font-size: 32rpx;
+  color: #FFFFFF;
 }
 .hole-btn{
-  color: #0ab906;
+  font-size: 32rpx;
+  color: #AAAAAA;
   background-color: #fff;
 }
 
@@ -118,4 +120,10 @@ button::after{
   display:block; 
   margin: 20rpx 0 180rpx 0;
   text-align: center;
+}
+
+.logo{
+  margin: 160rpx auto 240rpx;
+  width: 212rpx;
+  height: 212rpx;
 }

pages/order-detail/order-detail.js

@@ -41,7 +41,11 @@ Page({
     irrevocable: false,  //不可撤销
     sum: [],  //本单已申请单个退款的商品数组
     orderScore: 0, // 整单使用积分
-    orderNumSend:''
+    orderNumSend:'',
+    estimatedTime: '',
+    estimatedTimeStr: '',
+    sendInfo:null,//骑手信息
+    markers:[]
   },
 
   /**
@@ -52,7 +56,6 @@ Page({
       orderNumSend:options.orderNum
     })
     this.loadOrderDetail(options.orderNum);
-
   },
   /**
    * 加载订单数据
@@ -103,15 +106,74 @@ Page({
           canRefund: res.canRefund,
           canAllRefund: res.canAllRefund,
           orderScore: res.orderScore, // 整单使用积分
+          estimatedTime: res.estimatedTime,
+          estimatedTimeStr: res.estimatedTimeStr,
 
         });
         
         wx.hideLoading();
+        if(res.status==40){//配送中再获取骑手位置
+          ths.getSenderPosition()
+        }
       }
     };
     http.request(params);
 
   },
+  /**
+   * 获取骑手位置
+   */
+  getSenderPosition: function (e) {
+    wx.showLoading();
+    var ths = this;
+    var params = {
+      url: "/p/location/info",
+      method: "get",
+      data: {
+        orderNumber:this.data.orderNumber //'1978351838923198464'
+      },
+      callBack: res => {
+        wx.hideLoading();
+        console.log(res);
+        if(res.code == 200&&res.data){
+          let markers = [
+            {
+              // 骑手标记
+              id: 1,
+              longitude:res.data.longitude,
+              latitude: res.data.latitude,
+              iconPath: '../../images/icon/sender.png',  // 骑手图标
+              width: "140rpx",
+              height: '176rpx',
+              rotate: 0,  // 旋转角度（可根据方向动态调整）
+              zIndex: 3,   // 层级（骑手图标在最上层）
+              customCallout: {
+                anchorY: 0,
+                anchorX: 0,
+                display: 'ALWAYS',
+              },
+            },
+            {
+              // 收货地址
+              id: 2,
+              longitude:ths.data.userAddrDto.longitude,
+              latitude: ths.data.userAddrDto.latitude,
+              iconPath: '../../images/icon/head04.png',  // 图标
+              width: "80rpx",
+              height: '80rpx',
+              rotate: 0,  // 旋转角度（可根据方向动态调整）
+              zIndex: 3,   // 层级（骑手图标在最上层）
+            },
+          ]
+          ths.setData({
+            markers,
+            sendInfo:res.data
+          })
+        }
+      }
+    };
+    http.request(params);
+  },
   //跳转商品详情页
   toProdPage: function(e) {
     var prodid = e.currentTarget.dataset.prodid;
@@ -253,6 +315,12 @@ Page({
 
 },
 
+  callSender(){
+    wx.makePhoneCall({
+      phoneNumber: this.data.sendInfo.courierPhone//仅为示例，并非真实的电话号码
+    })
+  },
+
   // 一键复制事件
   copyBtn: function(e) {
     let data = e.currentTarget.dataset.value

pages/order-detail/order-detail.wxml

@@ -1,5 +1,39 @@
-<view class="DetailsOfRefund">
+<view class="order-detail">
+  <map 
+  wx:if="{{sendInfo}}"
+  id="orderMap"
+  longitude="{{sendInfo.longitude}}"  
+  latitude="{{sendInfo.latitude}}"   
+  scale="16"                 
+  markers="{{markers}}"     
+  polyline="{{polyline}}"   
+  show-location              
+  style="width: 100%; height: 300px;"  
+>
+<cover-view slot="callout">
+    <cover-view class="callout-box" marker-id="{{1}}">
+      <view class="title">骑手正在送货</view>
+      <!-- <view class="desc"></view> -->
+    </cover-view>
+  </cover-view>
+  </map>
+
+  <view class="order-sts" wx:else>{{statusObject[status]}}</view>
+
+    <view class="pay-box" wx:if="{{status == 0}}">
+    
+      <view class="pay-btn-box">
+        <view class="cancel-btn" bindtap="onCancelOrder">取消订单</view>
+        <view class="pay-btn" bindtap="onPayAgain">立即支付￥{{actualTotal}}</view>
+      </view>
+    </view>
+
   <view class="oprate-box box">
+  <view class="time-box" wx:if="">
+    <view class="title">预计送达时间</view>
+    <view class="time">{{estimatedTimeStr}}{{estimatedTime}}</view>
+  </view>
+    <view class="flex-box">
       <view class="item" wx:if="{{status == 60}}" bindtap="delOrderList" data-ordernum="{{orderNumber}}">
         <image class="icon" src="../../images/icon/del-icon.png" mode=""/>
         <view class="label">
@@ -12,6 +46,12 @@
           联系商家
         </view>
      </button>
+     <view class="item" wx:if="{{sendInfo}}" bind:tap="callSender">
+        <image class="icon" src="../../images/icon/sender-icon.png" mode=""/>
+        <view class="label">
+          联系骑手
+        </view>
+      </view>
      <view class="item" wx:if="{{status !=0 &&canRefund}}" bind:tap="applyRefund">
         <image class="icon" src="../../images/icon/apply.png" mode=""/>
         <view class="label">
@@ -24,8 +64,17 @@
           再次购买
         </view>
       </view> -->
+  </view>
       
     </view>
+
+    <view class='delivery-addr box'>
+      <view class='user-info'>
+        <text class='item'>{{userAddrDto.receiver}}</text>
+        <text class='item'>{{userAddrDto.mobile}}</text>
+      </view>
+      <view class='addr'>{{userAddrDto.address}}{{userAddrDto.addressName}}{{userAddrDto.addrDetail}}</view>
+    </view>
    
 
     <view class="refund-goods box">

pages/order-detail/order-detail.wxss

@@ -1,12 +1,29 @@
-/* pages/DetailsOfRefund/DetailsOfRefund.wxss */
-.DetailsOfRefund{
+/* pages/order-detail/order-detail.wxss */
+.order-detail{
   padding: 20rpx 24rpx 120rpx;
   background: #F6F6F6;
 }
+.callout-box{
+  background: #fff;
+  border-radius: 16rpx 16rpx 16rpx 16rpx;
+  padding: 14rpx 20rpx;
+}
+.callout-box .title{
+  font-weight: bold;
+  font-size: 28rpx;
+  color: #222222;
+}
+.callout-box .desc{
+  font-size: 24rpx;
+  color: #222222;
+  margin-top: 16rpx;
+}
+
 
 /* 店铺 */
 .shop-box {
   display: inline-block;
+  padding-bottom: 24rpx;
 }
 .shop-icon {
   display: inline-block;
@@ -27,36 +44,36 @@
   color: #222222;
 }
 
-.DetailsOfRefund .result-box{
+.order-detail .result-box{
   padding: 0 28rpx ;
 }
 
-.DetailsOfRefund .result-box .result{
+.order-detail .result-box .result{
   position: relative;
   padding: 24rpx 0;
   
 }
 
-.DetailsOfRefund .result-box .result .title{
+.order-detail .result-box .result .title{
   font-weight: bold;
   font-size: 32rpx;
   color: #222222;
 }
-.DetailsOfRefund .result-box .result .title.small{
+.order-detail .result-box .result .title.small{
   font-size: 28rpx;
 }
 
-.DetailsOfRefund .result-box .result .desc{
+.order-detail .result-box .result .desc{
   font-size: 24rpx;
   color: #AAAAAA;
   margin-top: 20rpx;
 }
-.DetailsOfRefund .result-box .result .title-box{
+.order-detail .result-box .result .title-box{
   display: flex;
   justify-content: space-between;
 }
 
-.DetailsOfRefund .result-box .result .price{
+.order-detail .result-box .result .price{
   font-weight: bold;
   font-size: 28rpx;
   color: #FF4D3A;
@@ -68,12 +85,95 @@
   margin-bottom: 20rpx;
 }
 
-.DetailsOfRefund .oprate-box{
-  display: flex;
+.order-detail .oprate-box{
+  /* display: flex; */
   padding: 0 24rpx;
   
 }
-.DetailsOfRefund .oprate-box .item{
+
+.order-sts{
+  font-weight: bold;
+  font-size: 36rpx;
+  color: #222222;
+  margin-bottom: 20rpx;
+}
+
+.pay-btn-box{
+  display: flex;
+  justify-content: space-between;
+}
+.pay-btn-box .cancel-btn{
+  width: 226rpx;
+  height: 68rpx;
+  line-height: 68rpx;
+  text-align: center;
+  background: #FFFFFF;
+  border-radius: 60rpx 60rpx 60rpx 60rpx;
+  font-weight: bold;
+  font-size: 28rpx;
+  color: #AAAAAA;
+}
+.pay-btn-box .pay-btn{
+  width: 456rpx;
+  height: 68rpx;
+  line-height: 68rpx;
+  text-align: center;
+  background: #FF941A;
+  border-radius: 60rpx 60rpx 60rpx 60rpx;
+  font-weight: bold;
+  font-size: 28rpx;
+  color: #FFFFFF;
+}
+
+.order-detail .delivery-addr {
+  padding: 20rpx 30rpx;
+  background: #fff;
+}
+.order-detail .delivery-addr .user-info {
+  line-height: 48rpx;
+  word-wrap: break-word;
+  word-break: break-all;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
+  font-weight: bold;
+  font-size: 32rpx;
+  color: #222222;
+}
+.order-detail .delivery-addr .user-info .item {
+  font-size: 28rpx;
+  margin-right: 30rpx;
+  vertical-align: top;
+  display: inline-block;
+}
+.order-detail .delivery-addr .addr {
+  font-size: 28rpx;
+  line-height: 36rpx;
+  font-size: 28rpx;
+  color: #AAAAAA;
+  margin-top: 20rpx;
+}
+
+
+.order-detail .time-box{
+  padding: 20rpx 0;
+}
+.order-detail .time-box .title{
+  font-size: 28rpx;
+  color: #222222;
+}
+.order-detail .time-box .time{
+  font-weight: bold;
+  font-size: 48rpx;
+  color: #222222;
+  margin-top: 20rpx;
+}
+.order-detail .flex-box{
+  display: flex;
+}
+.order-detail .oprate-box .item{
   width: 25%;
   text-align: center;
   margin: 0;
@@ -85,87 +185,87 @@
   outline: none;
   line-height: normal;
 }
-.DetailsOfRefund wx-button:after {
+.order-detail wx-button:after {
   border: none;
 }
-.DetailsOfRefund .oprate-box .item .icon{
+.order-detail .oprate-box .item .icon{
   width: 40rpx;
   height: 40rpx;
 }
 
-.DetailsOfRefund .oprate-box .item .label{
+.order-detail .oprate-box .item .label{
   font-size: 28rpx;
   color: #222222;
   margin-top: 20rpx;
 }
 
 
-.DetailsOfRefund .refund-goods{
+.order-detail .refund-goods{
   padding: 24rpx;
 }
 
-.DetailsOfRefund .refund-goods .title-box{
+.order-detail .refund-goods .title-box{
   display: flex;
   justify-content: space-between;
   padding-bottom: 24rpx;
   font-weight: bold;
   font-size: 28rpx;
 }
-.DetailsOfRefund .refund-goods .title-box .title{
+.order-detail .refund-goods .title-box .title{
   color: #222222;
 }
-.DetailsOfRefund .refund-goods .title-box .price{
+.order-detail .refund-goods .title-box .price{
   color: #FF4D3A;
 }
 
-.DetailsOfRefund .refund-goods .good-list{
+.order-detail .refund-goods .good-list{
 }
-.DetailsOfRefund .refund-goods .good-list .good-item{
+.order-detail .refund-goods .good-list .good-item{
   border-top:1rpx solid #F0F0F0;
   padding: 20rpx 0;
   display: flex;
 
 }
-.DetailsOfRefund .refund-goods .good-list .good-item .img{
+.order-detail .refund-goods .good-list .good-item .img{
   width: 120rpx;
   height: 120rpx;
   border-radius: 16rpx;
   background: #F6F6F6;
 }
-.DetailsOfRefund .refund-goods .good-list .good-item .info{
+.order-detail .refund-goods .good-list .good-item .info{
   margin-left: 20rpx;
   flex: 1;
 }
-.DetailsOfRefund .refund-goods .good-list .good-item .info .good-name{
+.order-detail .refund-goods .good-list .good-item .info .good-name{
   font-weight: bold;
   font-size: 28rpx;
   color: #222222;
 }
-.DetailsOfRefund .refund-goods .good-list .good-item .info .desc{
+.order-detail .refund-goods .good-list .good-item .info .desc{
   font-size: 24rpx;
   color: #AAAAAA;
   margin-top: 10rpx;
 }
-.DetailsOfRefund .refund-goods .good-list .good-item .info .price{
+.order-detail .refund-goods .good-list .good-item .info .price{
   color: #AAAAAA;
   font-size: 24rpx;
 }
-.DetailsOfRefund .refund-goods .good-list .good-item .price-box{
+.order-detail .refund-goods .good-list .good-item .price-box{
   display: flex;
   flex-direction: column;
   justify-content: space-between;
   align-items: flex-end;
 }
-.DetailsOfRefund .refund-goods .good-list .good-item .price-box .price{
+.order-detail .refund-goods .good-list .good-item .price-box .price{
   font-weight: bold;
   font-size: 32rpx;
   color: #FF4D3A;
 }
-.DetailsOfRefund .refund-goods .good-list .good-item .price-box .num{
+.order-detail .refund-goods .good-list .good-item .price-box .num{
   font-size: 24rpx;
   color: #AAAAAA;
 }
-.DetailsOfRefund .refund-goods .open-btn{
+.order-detail .refund-goods .open-btn{
   display: flex;
   align-items: center;
   justify-content: center;
@@ -173,74 +273,74 @@
   color: #222222;
   margin-top: 20rpx;
 }
-.DetailsOfRefund .refund-goods .open-btn .arrow{
+.order-detail .refund-goods .open-btn .arrow{
   width: 20rpx;
   height: 20rpx;
 }
 
-.DetailsOfRefund .goods-info{
+.order-detail .goods-info{
   padding: 24rpx;
 }
-.DetailsOfRefund .goods-info .item{
+.order-detail .goods-info .item{
   display: flex;
   justify-content: space-between;
   padding-bottom: 28rpx;
 
 }
-.DetailsOfRefund .goods-info .item .label{
+.order-detail .goods-info .item .label{
   font-size: 28rpx;
   color: #222222;
 }
 
-.DetailsOfRefund .goods-info .item .value{
+.order-detail .goods-info .item .value{
   font-weight: bold;
   font-size: 28rpx;
   color: #FF4D3A;
 }
-.DetailsOfRefund .goods-info .total{
+.order-detail .goods-info .total{
   display: flex;
   justify-content: space-between;
   padding-top: 28rpx ;
   border-top: 2rpx solid #F0F0F0;
 }
-.DetailsOfRefund .goods-info .total .label{
+.order-detail .goods-info .total .label{
   font-weight: bold;
   font-size: 28rpx;
   color: #222222;
 }
-.DetailsOfRefund .goods-info .total .value{
+.order-detail .goods-info .total .value{
   font-weight: bold;
   font-size: 28rpx;
   color: #FF4D3A;
 }
 
-.DetailsOfRefund .order-info{
+.order-detail .order-info{
   padding: 28rpx 24rpx;
 }
-.DetailsOfRefund .order-info .title{
+.order-detail .order-info .title{
   font-weight: bold;
   font-size: 32rpx;
   color: #222222;
 }
-.DetailsOfRefund .order-info .item{
+.order-detail .order-info .item{
   padding-top: 28rpx;
   display: flex;
   justify-content: space-between;
 }
-.DetailsOfRefund .order-info .item .label{
+.order-detail .order-info .item .label{
   font-size: 28rpx;
   color: #AAAAAA;
 }
-.DetailsOfRefund .order-info .item .value-box{
+.order-detail .order-info .item .value-box{
   display: flex;
   align-items: center;
 }
-.DetailsOfRefund .order-info .item .value-box .icon{
+.order-detail .order-info .item .value-box .icon{
   width: 30rpx;
   height: 30rpx;
   margin-left: 20rpx;
 }
-.DetailsOfRefund .order-info .item .value{
+.order-detail .order-info .item .value{
   font-weight: bold;
   font-size: 28rpx;
   color: #222222;

pages/prod-classify/prod-classify.json

@@ -2,7 +2,7 @@
   "usingComponents": {
     "prod": "/components/production/production"
   },
-  "navigationBarTitleText": "海马购精选",
+  "navigationBarTitleText": "市民请集合",
   "onReachBottomDistance": 0,
   "navigationBarBackgroundColor": "#fff",
   "navigationBarTextStyle": "black",

pages/shopInfo/shopInfo.wxml

@@ -45,7 +45,7 @@
 	<!-- <view class="shopDetails">
 		<view class="otherItem">
 			<text class="itemContent">店铺简介</text>
-			<view>海马购自营超市~~</view>
+			<view>市民请集合~~</view>
 
 		</view>
 		<view class="otherItem">

pages/submit-order/submit-order.js

@@ -135,6 +135,12 @@ Page({
       },
       callBack: res => {
         wx.hideLoading();
+        if(res.code == 500){
+          return wx.showToast({
+            title: res.msg,
+            icon:'none'
+          })
+        }
         
         this.setData({
           address_id: res.userAddr?res.userAddr.addrId:0,

pages/user/user.js

@@ -39,8 +39,8 @@ Page({
    */
   onShow: function() {
     this.setData({
-      // isAuthInfo: Boolean(wx.getStorageSync('loginResult').userId),
-      isAuthInfo: Boolean(wx.getStorageSync('loginResult').nickName),
+      isAuthInfo: Boolean(wx.getStorageSync('loginResult').userId),
+      // isAuthInfo: Boolean(wx.getStorageSync('loginResult').nickName),
       loginResult: wx.getStorageSync('loginResult')
     })
     // 查看是否授权，然后加载订单数据
@@ -287,6 +287,7 @@ Page({
   },
 
   toOrderListPage: function(e) {
+    console.log(this.data.isAuthInfo);
     if (!this.data.isAuthInfo) {
       wx.navigateTo({
         url: '/pages/login/login',

pages/user/user.wxml

@@ -11,7 +11,7 @@
         <!-- <button class="update-info-btn" open-type="getUserInfo" bindgetuserinfo="toPersonalInfo">更新用户信息</button> -->
       </view>
       <view class="canpany">
-        中数未来(广州)信息技术有限公司
+        铜仁移动
       </view>
       <!-- <view class="level">
         <image class="l-bg" src="{{userLevelInfo.levelType==1?'../../images/icon/integral-icon.png':'../../images/icon/normal-icon.png'}}" role="img"></image>
@@ -51,7 +51,7 @@
         </view>
       </view>
       <view class='procedure'>
-        <view class='items' bindtap='toOrderListPage' data-sts="1">
+        <view class='items' bindtap='toOrderListPage' data-sts="0">
           <image src='../../images/icon/toPay.png'></image>
           <text>待支付</text>
           <text class='num-badge' wx:if="{{orderAmount.unPay>0}}">{{orderAmount.unPay}}</text>
@@ -61,12 +61,12 @@
           <text>待发货</text>
           <text class='num-badge' wx:if="{{orderAmount.payed>0}}">{{orderAmount.payed}}</text>
         </view> -->
-        <view class='items' bindtap='toOrderListPage' data-sts="3">
+        <view class='items' bindtap='toOrderListPage' data-sts="20">
           <image src='../../images/icon/toTake.png'></image>
           <text>待收货</text>
           <text class='num-badge' wx:if="{{orderAmount.consignment>0}}">{{orderAmount.consignment}}</text>
         </view>
-        <view class='items' bindtap='toOrderListPage' data-sts="5">
+        <view class='items' bindtap='toOrderListPage' data-sts="80">
           <image src='../../images/icon/toComment.png'></image>
           <text>已完成</text>
         </view>

project.private.config.json

@@ -19,6 +19,18 @@
     "ignoreDevUnusedFiles": true,
     "bigPackageSizeSupport": false
   },
-  "condition": {},
+  "condition": {
+    "miniprogram": {
+      "list": [
+        {
+          "name": "pages/writeReturnLogistics/writeReturnLogistics",
+          "pathName": "pages/writeReturnLogistics/writeReturnLogistics",
+          "query": "",
+          "scene": null,
+          "launchMode": "default"
+        }
+      ]
+    }
+  },
   "libVersion": "3.9.3"
 }

utils/config.js

@@ -2,9 +2,9 @@
 // var domain = "https://shop-h5.zswllife.cn/api"; //统一接口域名，正式环境 
 // var wsDomain = "wss://shop-h5.zswllife.cn/api"; //统一接口域名，正式环境 
 
-var domain = "https://bus.qlapp.cn"; //统一接口域名，测试环境 
+var domain = "https://shop.api.zswlgz.com"; //统一接口域名，测试环境 
 var wsDomain = "wss://shop-h5.dev.zswllife.cn/api"; //统一接口域名，测试环境 
-// var domain = "https://shop.haimamart.com/api"; //统一接口域名，正式环境 
+// var domain = "https://shop.api.zswlgz.com"; //统一接口域名，正式环境 
 // var wsDomain = "wss://shop.haimamart.com/api"; //统一接口域名，正式环境 
 
 // var domain = "http://192.168.1.206:8112"; //统一接口域名，测试环境