update modules

eaterplanet · Aug 29, 2021 · 0043888 · 0043888
1 parent 5461b78
commit 0043888
Show file tree

Hide file tree

Showing 24 changed files with 218 additions and 95 deletions.
diff --git a/eaterplanet_ecommerce/moduleA/groupCenter/groupDetail.json b/eaterplanet_ecommerce/moduleA/groupCenter/groupDetail.json
@@ -10,6 +10,7 @@
     "i-order-info-express": "../../components/order/orderInfoExpress",
     "i-orderComment": "../../components/orderComment/index",
     "i-order-info": "../../components/orderInfo/index",
-    "i-modal": "../../components/modal/index"
+    "i-modal": "../../components/modal/index",
+    "i-cashon_delivery": "../../components/cashon_delivery/index"
   }
 }
diff --git a/eaterplanet_ecommerce/moduleA/groupCenter/groupDetail.wxml b/eaterplanet_ecommerce/moduleA/groupCenter/groupDetail.wxml
@@ -19,7 +19,10 @@
 					<view class="goodsList">
 						<i-img class="goodsImg" defaultImage="../../images/placeholder-refund.png" height="60" iClass="img-class" loadImage="{{goodsInfo.image}}" width="60"></i-img>
 						<view class="goos-item">
-							<view class="goodsTitle">{{goodsInfo.name}}</view>
+							<view class="i-flex i-flex-spb">
+								<view class="goodsTitle i-flex-item">{{goodsInfo.name}}</view>
+								<i-cashon_delivery paymentCode="{{order.order_info.payment_code}}" codeImg="{{order.order_info.cashondelivery_code_img}}"></i-cashon_delivery>
+							</view>
 							<view class="attribute">
 								<span>
 									<block wx:if="{{goodsInfo.option_str}}">规格：{{goodsInfo.option_str}} </block>数量：{{goodsInfo.quantity}}
@@ -48,14 +51,19 @@
 						</view>
 					</view>
 				</view>
-				<view class="px15 py10 text-right">
-					<view class="mb5" wx:if="{{head_shipping_fare}}">
-						团长配送费:<text class="red weight">￥{{head_shipping_fare}} </text><text class="fsz-24 text-gray">(归团长收入)</text>
+				<view class="px15 py10 i-flex">
+					<view class="bule u-m-r-10" wx:if="{{order.order_info.payment_code=='cashon_delivery'}}">
+						货到付款
 					</view>
-					<view bindtap="handleTipDialog">
-						实际佣金:<text class="red weight">￥{{commision}} </text>
-						<text class="iconfont icon-shuoming text-dark fsz-28"></text>
-						<text class="fsz-24 text-gray"> ({{is_statements_state==1?'已结算':'待结算'}}<block wx:if="{{is_statements_state==1&&statements_end_date}}"> {{statements_end_date}}</block>)</text>
+					<view class="i-flex-item text-right">
+						<view class="mb5" wx:if="{{head_shipping_fare}}">
+							团长配送费:<text class="red weight">￥{{head_shipping_fare}} </text><text class="fsz-24 text-gray">(归团长收入)</text>
+						</view>
+						<view bindtap="handleTipDialog">
+							实际佣金:<text class="red weight">￥{{commision}} </text>
+							<text class="iconfont icon-shuoming text-dark fsz-28"></text>
+							<text class="fsz-24 text-gray"> ({{is_statements_state==1?'已结算':'待结算'}}<block wx:if="{{is_statements_state==1&&statements_end_date}}"> {{statements_end_date}}</block>)</text>
+						</view>
 					</view>
 				</view>
 			</view>

diff --git a/eaterplanet_ecommerce/moduleA/groupCenter/groupList.wxml b/eaterplanet_ecommerce/moduleA/groupCenter/groupList.wxml
@@ -37,8 +37,9 @@
             <view class="spu">
               <image src='{{goods.goods_images}}' class='i-class goodsImg' mode='widthFix'></image>
               <view class="detail">
-                <view class="spuName">
-                  <text>{{goods.name}}</text>
+                <view class="spuName i-flex">
+                  <text class="i-flex-item">{{goods.name}}</text>
+                  <view class="u-font-24 bule u-m-l-5" wx:if="{{item.payment_code=='cashon_delivery'}}">货到付款</view>
                 </view>
                 <view class="tips">
                   <span>商品数量：{{goods.quantity}}</span>

diff --git a/eaterplanet_ecommerce/moduleA/groupCenter/index.wxml b/eaterplanet_ecommerce/moduleA/groupCenter/index.wxml
@@ -42,7 +42,7 @@
           </view>
           <view class="income" bindtap="confirmMessage">
             <text class="incomeTop">{{total_order_count}}</text>
-            <view class="incomeBottom">总订单 <text class="iconfont icon-shuoming red fsz-24"></text></view>
+            <view class="incomeBottom">总订单 <text class="iconfont icon-shuoming blue fsz-24"></text></view>
           </view>
           <view class="income">
             <text class="incomeTop">{{total_member_count}}</text>

diff --git a/eaterplanet_ecommerce/moduleA/groupCenter/pendingDeliveryOrders.js b/eaterplanet_ecommerce/moduleA/groupCenter/pendingDeliveryOrders.js
@@ -276,11 +276,15 @@ Page({
     var n = this.data.order;
 
     var sub_order_arr = [];
+    let is_cashon_delivery = false;
 
     n.forEach(function(e) {
       if (e.checked) {
         sub_order_arr.push(e.order_id)
       }
+      if(e.payment_code=="cashon_delivery") {
+        is_cashon_delivery = true;
+      }
     })
 
     if (sub_order_arr.length <= 0) {
@@ -293,7 +297,7 @@ Page({
     var token = wx.getStorageSync('token');
     wx.showModal({
       title: "订单提货确认",
-      content: "请确认买家已收选中的商品，再进行提货确认哦！",
+      content: is_cashon_delivery?"所选商品含货到付款，请再次确认是否已收款":"请确认买家已收选中的商品，再进行提货确认哦！",
       confirmText: "确定",
       confirmColor: "#FF673F",
       success: function(t) {

diff --git a/eaterplanet_ecommerce/moduleA/groupCenter/pendingDeliveryOrders.json b/eaterplanet_ecommerce/moduleA/groupCenter/pendingDeliveryOrders.json
@@ -6,6 +6,7 @@
       "navBar": "miniprograms-navigation-bar/index",
     "i-auth": "../../components/auth/index",
     "component-img": "../../components/image/index",
-    "i-aside-btn": "../../components/asideBtn/index"
+    "i-aside-btn": "../../components/asideBtn/index",
+    "i-cashon_delivery": "../../components/cashon_delivery/index"
   }
 }
diff --git a/eaterplanet_ecommerce/moduleA/groupCenter/pendingDeliveryOrders.wxml b/eaterplanet_ecommerce/moduleA/groupCenter/pendingDeliveryOrders.wxml
@@ -14,10 +14,13 @@
                 </view>
               </checkbox-group>
             </label>
-            <view class="order-msg">
-              <span>订单编号：{{item.order_num_alias}}</span>
+            <view class="order-msg u-p-t-20 u-p-b-20">
+              <view class="i-flex i-flex-spb">
+                <view>订单编号：{{item.order_num_alias}}</view>
+              </view>
               <view class="fsz-24">提货人：{{item.shipping_name}}<text class="ml30">手机号：{{item.shipping_tel}}</text></view>
-              <em class="fsz-24 mt5">{{item.createTime}}</em>
+              <em class="fsz-24 mt5 u-m-b-10">{{item.createTime}}</em>
+              <i-cashon_delivery paymentCode="{{item.payment_code}}" codeImg="{{item.cashondelivery_code_img}}"></i-cashon_delivery>
             </view>
             <view class="order-status">{{item.status_name}}</view>
           </view>
@@ -34,6 +37,7 @@
                 </view>
                 <view class="goods-detail">
                   <view class="goods-title">{{skuItem.name}}</view>
+                  <view class="u-font-24 bule u-m-t-10" wx:if="{{item.payment_code=='cashon_delivery'}}">货到付款</view>
                   <view class="goods-desc"><text wx:if="{{skuItem.option_str}}">{{skuItem.option_str}};</text> 共{{skuItem.quantity}}件</view>
                 </view>
                 <view class="goods-sign-btn goods-sign-btn-disabled" style="display:none;" wx:if="{{skuItem.orderSkuStatus===-1}}">提货确认</view>

diff --git a/eaterplanet_ecommerce/moduleA/groupCenter/pendingDeliveryOrders.wxss b/eaterplanet_ecommerce/moduleA/groupCenter/pendingDeliveryOrders.wxss
@@ -50,12 +50,12 @@
   align-items: center;
   background: #fff;
   margin-bottom: 2rpx;
-  height: 145rpx;
+  /* height: 145rpx; */
 }
 
 .order-item .order-title .order-msg {
   width: 550rpx;
-  height: 145rpx;
+  /* height: 145rpx; */
   display: flex;
   flex-direction: column;
   justify-content: center;
@@ -119,7 +119,7 @@
   text-overflow: initial;
   white-space: normal;
   font-size: 28rpx;
-  height: 80rpx;
+  /* height: 80rpx; */
   margin-bottom: 12rpx;
 }
 

diff --git a/eaterplanet_ecommerce/moduleA/menu/index.js b/eaterplanet_ecommerce/moduleA/menu/index.js
@@ -7,7 +7,7 @@ Page({
   data: {
     loadMore: true,
     classification: {
-      tabs: [],
+      menutabs: [],
       activeIndex: 0
     },
     tabTop: 0,

diff --git a/eaterplanet_ecommerce/moduleA/menu/index.json b/eaterplanet_ecommerce/moduleA/menu/index.json
@@ -8,7 +8,7 @@
     "i-new-auth": "../../components/new-auth/index",
     "masonry": "../components/masonry/masonry",
     "i-img": "../../components/img/index",
-    "i-tabs": "../../components/tabs/index",
+    "i-menutabs": "../../components/menutabs/index",
     "img-box": "../components/img-box/img-box",
     "i-empty": "../../components/empty/index",
     "i-tabbar": "../../components/tabbar/index"

diff --git a/eaterplanet_ecommerce/moduleA/menu/index.wxml b/eaterplanet_ecommerce/moduleA/menu/index.wxml
@@ -13,7 +13,7 @@
   </view>
   <view class="pb100"></view>
   <!-- 幻灯片 -->
-  <view class="swipe bg-ff" wx:if="{{adv_arr.length>0}}">
+  <view class="swipe bg-ff" wx:if="{{adv_arr.length>0}}" style="background-color: #ff758c;">
     <swiper indicatorDots class="swiper-content" duration="400" autoplay indicatorActiveColor="{{skin.color}}" indicatorColor="#FF5344" interval="5000" circular>
       <swiper-item wx:for="{{adv_arr}}" wx:key="id">
         <view class='banner' bindtap='goBannerUrl' data-idx="{{index}}">
@@ -23,14 +23,14 @@
     </swiper>
   </view>
   <!-- 导航 -->
-  <view class="cate bg-ff">
+  <view class="cate bg-ff" style="background-color: #ff758c;">
     <view class="cate-title weight">今日推荐</view>
     <view id="tab" style="{{oneFixed=='Fixed'?'height: 90rpx;':'height: 0;'}}"></view>
     <view class="sticky-content i-flex i-flex-spb bg-ff {{oneFixed}}" wx:if="{{classification.tabs.length}}">
       <view class="i-flex-item" style="width: 0;">
-        <i-tabs activeIndex="{{classification.activeIndex}}" bind:activeIndexChange="classificationChange" fontColor="#000" iClass="category-list" tabs="{{classification.tabs}}" lineBgColor="{{'background:linear-gradient(to right, '+skin.color+', '+skin.light+')'}}"></i-tabs>
+        <i-menutabs activeIndex="{{classification.activeIndex}}" bind:activeIndexChange="classificationChange" fontColor="#000" iClass="category-list" tabs="{{classification.tabs}}" lineBgColor="{{'background:linear-gradient(to right, '+skin.color+', '+skin.light+')'}}"></i-menutabs>
+
       </view>
-      <navigator url="/eaterplanet_ecommerce/moduleA/menu/subcate" hover-class="none" class="iconfont icon-fenlei_"></navigator>
     </view>
   </view>
   <!-- 列表 -->

diff --git a/eaterplanet_ecommerce/moduleA/menu/index.wxss b/eaterplanet_ecommerce/moduleA/menu/index.wxss
@@ -1,6 +1,6 @@
 .search-box {
     position: fixed;
-
+   background-color: #ff758c;
     left: 0;
     right: 0;
     padding: 20rpx;
@@ -34,7 +34,7 @@
 .search-fav {
     text-align: center;
     line-height: 1;
-    color: #a1a8ca;
+    color: #fff;
 }
 
 .search-fav .iconfont {
@@ -43,13 +43,13 @@
 
 /* 幻灯片 */
 .swipe {
-  height: 320rpx;
+  height: 200rpx;
 }
 
 .swiper-content {
   width: 750rpx;
-  height: 320rpx;
-  border-radius: 12rpx;
+  height: 200rpx;
+  border-radius: 20rpx;
 }
 
 .swiper-content swiper-item {
@@ -65,26 +65,27 @@
 
 .swiper-content .banner {
   width: 710rpx;
-  height: 320rpx;
+  height: 200rpx;
   margin: 0 20rpx;
   display: block;
-  border-radius: 12rpx;
+  border-radius: 20rpx;
   position: relative;
   overflow: hidden;
 }
 
 .swiper-content .banner .banner-img {
   width: 710rpx;
-  height: 320rpx;
-  border-radius: 12rpx;
+  height: 200rpx;
+  border-radius: 20rpx;
   display: block;
   overflow: hidden;
 }
 
 .cate-title {
   position: relative;
-  padding: 30rpx 20rpx 20rpx 40rpx;
+  padding: 30rpx 20rpx 16rpx 40rpx;
   font-size: 34rpx;
+  color: #fff;
 }
 
 .cate-title::before {
@@ -93,7 +94,7 @@
     top: 35rpx;
     bottom: 20rpx;
     left: 20rpx;
-    border-left: 8rpx solid #ff758c;
+    border-left: 8rpx solid #fff;
 }
 
 ::-webkit-scrollbar {

diff --git a/eaterplanet_ecommerce/moduleA/menu/subcate.wxml b/eaterplanet_ecommerce/moduleA/menu/subcate.wxml
@@ -1,4 +1,5 @@
 <!-- 子分类 -->
+<navBar title="菜谱分类" background='#ff758c' back="{{true}}" iconTheme='white' color='#fff' bindback="handlerGobackClick"/>
 <view class="cate bg-f">
   <block wx:for="{{subCate}}" wx:key="id">
     <view class="sub-tit weight">{{item.name}}</view>

diff --git a/eaterplanet_ecommerce/moduleA/pin/goodsDetail.wxml b/eaterplanet_ecommerce/moduleA/pin/goodsDetail.wxml
@@ -107,7 +107,39 @@
       </view>
     </view>
 
-    <view class="pinRecords buyRecords">
+    <!-- 返利拼团 -->
+    <view class="pinRecords buyRecords" wx:if="{{pin_info.is_pintuan_rebate==1}}">
+      <view class="pinIntro" bindtap="goLink" data-link="/eaterplanet_ecommerce/pages/user/rule?type=pintuanRebate">
+        <view class="i-flex i-flex-spb pinIntro-top">
+          <view class="pinIntro-title">拼团玩法</view>
+          <view class="">查看规则<text class="iconfont icon-youjiantou"></text></view>
+        </view>
+        <view class="i-flex i-flex-spb pinIntro-bot">
+          <view class="rule-item">
+            <view class="step">1</view>
+            <view class="p">支付开团</view>
+            <view class="p">参团</view>
+          </view>
+          <view class="rule-item">
+            <view class="step">2</view>
+            <view class="p">邀请用户</view>
+            <view class="p">参团</view>
+          </view>
+          <view class="rule-item">
+            <view class="step">3</view>
+            <view class="p">拼团成功中</view>
+            <view class="p">奖人员发货</view>
+          </view>
+          <view class="rule-item">
+            <view class="step">4</view>
+            <view class="p">未中奖人员退</view>
+            <view class="p">款发放奖励</view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <!-- 普通拼团 -->
+    <view class="pinRecords buyRecords" wx:else>
       <view class="pinIntro" bindtap="goLink" data-link="/eaterplanet_ecommerce/pages/user/rule?type=pintuan">
         <view class="i-flex i-flex-spb pinIntro-top">
           <view class="pinIntro-title">拼团玩法</view>
@@ -321,10 +353,11 @@
 
             </movable-view>
 
-            <movable-view y="1040rpx" direction="vertical" class="fixed-service" openType="contact" wx:if="{{isShowContactBtn==1}}">
-                <text class="iconfont icon-kefu"></text>
-                <view>客服</view>
-
+            <movable-view y="1040rpx" direction="vertical">
+                <button class="fixed-service" openType="contact" wx:if="{{isShowContactBtn==1}}">
+                    <text class="iconfont icon-kefu"></text>
+                    <view>客服</view>
+                </button>
             </movable-view>
 
             <movable-view y="1040rpx" direction="vertical" bindtap="backTop" class="fixed-top" hidden="{{!isSticky}}" wx:if="{{ishow_index_gotop==1}}">
@@ -333,7 +366,7 @@
 
             </movable-view>
         </view>
-<i-order-notify iClass="order-notify" stopNotify="{{stopNotify}}" wx:if="{{order_notify_switch==1}}"></i-order-notify>
+<i-order-notify i-class="order-notify" wx:if="{{order_notify_switch==1}}" stopNotify="{{stopNotify}}" />
 <i-new-auth needAuth="{{needAuth&&showAuthModal}}" bind:authSuccess="authSuccess" bind:cancel="authModal" needPosition="{{needPosition}}"></i-new-auth>
 <!-- 新分享形式 Start -->
 <view class='share-modal' bindtap='closeShareModal' hidden='{{hideModal}}'>

diff --git a/eaterplanet_ecommerce/moduleA/pin/goodsDetail.wxss b/eaterplanet_ecommerce/moduleA/pin/goodsDetail.wxss
@@ -1241,7 +1241,6 @@ button[plain] {
 
 .fixed-service {
     display: inline-block;
-    transform: translateY(860rpx);
     width: 80rpx;
     height: 80rpx;
     background: #e7614d93;