ud

packageUser/pages/user/logistics/logistics.js

@@ -59,11 +59,11 @@ Page({
   	var token = wx.getStorageSync('lbt_token_key');
   	// console.log('nowtoken',token);
   	wx.request({
-  	  url: 'https://jingcai.hiwavo.com/three/order/express',
+  	  url: 'https://app-api.fohowyc.com/express/query',
 	  data:{
-		  tf_code:that.data.order.express_order_no,
-		  express_code:this.data.order.express_code,
-		  tel:this.data.order.tel
+		  no:that.data.order.express_order_no,
+		  type:this.data.order.express_code,
+		  mobile:this.data.order.tel
 	  },
   	  method: 'POST',
   	  header: {
@@ -73,8 +73,8 @@ Page({
   	  },
   	  success: function (res) {
 		  console.log('res',res);
-  	    if(res.data.s == 0){
-  	    	var data = res.data.d;
+  	    if(res.data.code == 0){
+  	    	var data = res.data.data.Data.list;
   	      // data['list'] = data.reverse();
 		  console.log('data',data);
   	      that.setData({

pages/canteen/order/order.js

@@ -117,7 +117,8 @@ Page({
 	   console.log('radio发生change事件，携带value值为：', e.detail.value);
 	   if(e.detail.value == 0){
 		   this.setData({
-		   	checkbox:[]
+		   	checkbox:[],
+			date1: this.data.today,
 		   });
 		   this.getSingleRule();
 	   }

pages/home/home.js

@@ -34,7 +34,7 @@ Page ({
     bgcolor: '#eee',
     progress: 0,
     progress1: 0,
-    // day: '00',
+    day: '',
     hour: '00',
     min: '00',
     second: '00',
@@ -411,8 +411,8 @@ Page ({
 		
         var d, h, m, s, ms;
         if (leftTime >= 0) {
-          // day = parseInt(ctime / 86400)
-          h = parseInt(leftTime / 3600)
+          let day = parseInt(leftTime / 86400)
+          h = parseInt(leftTime / 3600 / 24)
           m = parseInt(leftTime / 60 ) - parseInt(leftTime / 3600) * 60
           s = parseInt(leftTime) - parseInt(leftTime / 60 ) * 60
           // d = Math.floor(leftTime / 1000 / 60 / 60 / 24);
@@ -425,6 +425,7 @@ Page ({
           m = m < 10 ? "0" + m : m
           h = h < 10 ? "0" + h : h
           that.setData({
+			  day:day,
             hour: h,
             min: m,
             second: s,
@@ -439,6 +440,7 @@ Page ({
             hour: '00',
             min: '00',
             second: '00',
+			day:''
             // msecond: '00'
           })
         }

pages/home/home.wxml

@@ -114,6 +114,8 @@
                 <view class="time-item time-kuang">{{min}}</view>
                 <view class="time-item time-color"> : </view>
                 <view class="time-item time-kuang">{{hour}}</view>
+				<view class="time-item time-color" wx:if="day" style="margin-top: 2px;"> 天 </view>
+				<view class="time-item time-kuang" wx:if="day">{{day}}</view>
               </view>
               <view class="time-text">本期剩余时间</view>
             </view>
@@ -130,6 +132,8 @@
 			    <view class="time-item time-kuang">{{min}}</view>
 			    <view class="time-item time-color"> : </view>
 			    <view class="time-item time-kuang">{{hour}}</view>
+				<view class="time-item time-color" wx:if="day" style="margin-top: 2px;"> 天 </view>
+				<view class="time-item time-kuang" wx:if="day">{{day}}</view>
 			  </view>
 			  <view class="time-text">距离秒杀开始时间</view>
             </view>

pages/home/home.wxss

@@ -498,7 +498,7 @@
 .time-kuang {
   background: #594848;
   height: 42rpx;
-  width: 39rpx;
+  width: 50rpx;
   text-align: center;
   line-height: 42rpx;
   font-size: 24rpx;

pages/parse/parse.json

@@ -1,7 +1,7 @@
 {
   "navigationBarTitleText": "凤凰菁选商城",
   "usingComponents": {
-    "format-time": "../../../component/formatTime/formatTime"
+    "format-time": "../../component/formatTime/formatTime"
   },
   "backgroundColor": "#ffffff"
 }

pages/projects/project-detail/project-detail.js

@@ -30,6 +30,7 @@ Page({
     posterImage: null,
     imgindex: 1,
     popup: false,
+	day:'',
     hour: '00',
     min: '00',
     second: '00',
@@ -969,8 +970,8 @@ Page({
         var leftTime = that.data.clock - t
         var d, h, m, s, ms;
         if (leftTime >= 0) {
-          // day = parseInt(ctime / 86400)
-          h = parseInt(leftTime / 3600)
+          let day = parseInt(leftTime / 86400)
+          h = parseInt(leftTime / 3600 / 24)
           m = parseInt(leftTime / 60 ) - parseInt(leftTime / 3600) * 60
           s = parseInt(leftTime) - parseInt(leftTime / 60 ) * 60
           // d = Math.floor(leftTime / 1000 / 60 / 60 / 24);
@@ -983,6 +984,7 @@ Page({
           m = m < 10 ? "0" + m : m
           h = h < 10 ? "0" + h : h
           that.setData({
+			  day:day,
             hour: h,
             min: m,
             second: s,
@@ -997,6 +999,7 @@ Page({
             hour: '00',
             min: '00',
             second: '00',
+			day:''
             // msecond: '00'
           })
         }

pages/projects/project-detail/project-detail.wxml

@@ -51,6 +51,8 @@
             <view class="time-item time-kuang">{{min}}</view>
             <view class="time-item time-color"> : </view>
             <view class="time-item time-kuang">{{hour}}</view>
+			<view class="time-item time-color" wx:if="day" style="margin-top: 2px;"> 天 </view>
+			<view class="time-item time-kuang" wx:if="day">{{day}}</view>
           </view>
           <view class="time-text">本期剩余时间</view>
         </view>
@@ -192,9 +194,11 @@
         </navigator>
       </view>
       -->
-      <view class="detail-footer-item" style="flex: 0.18;" bindtap="createPoster" wx:if="{{readOnly == 0}}">
-        <image src="../../../images/footer/poster.png" class="p-footer-icon"></image>
-        <text class="p-footer-text">分享</text>
+      <view class="detail-footer-item" style="flex: 0.18;">
+		  <view bindtap="createPoster" wx:if="{{readOnly == 0}}">
+			  <image src="../../../images/footer/poster.png" class="p-footer-icon"></image>
+			  <text class="p-footer-text">分享</text>
+		  </view>
       </view>
 	  
       <!-- <view class="detail-footer-item" style="flex: 0.5;">
@@ -215,7 +219,7 @@
 		  <format-time type="formatTime" value="{{project.deliver_start_time}}" ></format-time>开售，敬请期待！
 		</button>
 	  </form>
-	  <view class="detail-footer-item detail-black" wx:if="{{project.is_deliver &&project.left_count <= 0 || project.deliver_state == 3}}">
+	  <view class="detail-footer-item detail-black" wx:if="{{!project.package && project.is_deliver &&project.left_count <= 0 || project.deliver_state == 3}}">
 		<text>已售罄</text>
 	  </view>
 	  
@@ -227,7 +231,7 @@
 	  <button class="detail-footer-item detail-yellow" bindtap="toCart" wx:if="{{!project.is_deliver &&project.left_count > 0 && project.seckill_state !='end'}}">
 	  				<text>加入购物车</text>
 	  </button>
-	  <form bindsubmit="toPay" report-submit="{{true}}" wx:if="{{!project.is_deliver &&project.left_count > 0 && (project.seckill_state !='end' && project.seckill_state !='preparing')}}" class="detail-footer-item">
+	  <form bindsubmit="toPay" report-submit="{{true}}" wx:if="{{project.package || !project.is_deliver && project.left_count > 0 && (project.seckill_state !='end' && project.seckill_state !='preparing')}}" class="detail-footer-item">
 				<button class=" detail-red"  formType="submit">
 				  立即购买
 				</button>
@@ -242,7 +246,7 @@
 				  秒杀已结束
 				</button>
 	  </form>
-	  <view class="detail-footer-item detail-black" wx:if="{{!project.is_deliver &&project.left_count <= 0}}">
+	  <view class="detail-footer-item detail-black" wx:if="{{!project.package && !project.is_deliver &&project.left_count <= 0}}">
 				<text>已售罄</text>
 	  </view>
     </view>

pages/projects/project-detail/project-detail.wxss

@@ -464,7 +464,7 @@
 .time-kuang {
   background: #594848;
   height: 42rpx;
-  width: 39rpx;
+  width: 50rpx;
   text-align: center;
   line-height: 42rpx;
   font-size: 24rpx;

pages/projects/projects.wxml

@@ -63,7 +63,7 @@
           
         </view>
         <image class="project-right" src="{{item.cover}}"></image>
-        <view class="project-out" wx:if="{{item.left_count <= 0}}"></view>
+        <view class="project-out" wx:if="{{!item.package && item.left_count <= 0}}"></view>
         <view class="project-green" wx:if="{{item.is_support_poor === 1}}"></view>
         <view class="project-stop" wx:if="{{todaysend < item.deliver_start_time && todaysend > item.deliver_stop_time}}">将于<format-time type="formatmonth2" value="{{item.deliver_start_time}}"></format-time>发货</view>
         <view class="clean"></view>

project.private.config.json

@@ -1,6 +1,6 @@
 {
   "setting": {
-    "urlCheck": true,
+    "urlCheck": false,
     "compileHotReLoad": true
   },
   "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",

utils/request.js

@@ -3,12 +3,12 @@
 // const apiHostX = 'https://xj.hiwavo.com/';//正式
 
 // 新正式
-// const apiHost = 'https://xcx-api.fohowyc.com/';
-// const apiHostX = 'https://app-api.fohowyc.com/';//正式
+const apiHost = 'https://xcx-api.fohowyc.com/';
+const apiHostX = 'https://app-api.fohowyc.com/';//正式
 
 // 测试
-const apiHost = 'https://tfohowapi.hiwavo.com/';
-const apiHostX = 'https://txj.hiwavo.com/';
+// const apiHost = 'https://tfohowapi.hiwavo.com/';
+// const apiHostX = 'https://txj.hiwavo.com/';