代码字眼更改

openmerchant/shopentry/processidentity.vue

@@ -204,6 +204,7 @@
       :formatter="formatter"
       @confirm="handleStartConfirm"
       :closeOnClickOverlay="true"
+	  :minDate="795540417000"
 	  :maxDate="4102358400000"
       @cancel="identification_valid_date_startShow = false"
     ></u-datetime-picker>
@@ -215,6 +216,7 @@
       :closeOnClickOverlay="true"
       :formatter="formatter"
       @confirm="handleEndConfirm"
+	  :minDate="795540417000"
 	  :maxDate="4102358400000"
       @cancel="identification_valid_date_EndShow = false"
     ></u-datetime-picker>

pages/cashier/index.vue

@@ -58,6 +58,14 @@
           总京豆: {{ jingdou || 0 }}
         </view>
       </view>
+	  <view class="cashier-list-top">
+	    <view class="cashier-jilu-top" >
+	      线上支付总订单数: {{ xianxia || 0 }}
+	    </view>
+	    <view class="cashier-jilu-top">
+	      下线支付总订单数: {{ xianshang || 0 }}
+	    </view>
+	  </view>
       <view class="cashier-list-top"></view>
 
       <view class="cashier-list-top">
@@ -158,7 +166,7 @@
               dataList.gongxianSumsum == undefined ? 0 : dataList.gongxianSumsum
             }}
           </view>
-          <view class="sf"> 贡献值 </view>
+          <view class="sf"> 分润值 </view>
         </view>
         <!-- 默认 -->
         <view class="yis">
@@ -250,6 +258,8 @@ export default {
       gongxian: 0,
       jingdou: 0,
       phpToken: "",
+      xianxia: 0,
+      xianshang: 0,
       
     };
   },
@@ -558,6 +568,8 @@ export default {
           if (res.data.status == 200) {
             this.gongxian = res.data.data.list.fenrunzhi || 0;
             this.jingdou = res.data.data.list.jingdou;
+			this.xianxia = res.data.data.list.xianxia;
+			this.xianshang = res.data.data.list.xianshang;
           }
         },
         (fail) => {

pages/cashier/latestRecords.vue

@@ -13,7 +13,7 @@
       </view>
       <view class="record-info">
         <view class="record-time">{{ item.pay_time }}</view>
-        <view class="pv-info">pv: {{ item.pv }}</view>
+        <!-- <view class="pv-info">pv: {{ item.pv }}</view> -->
         <view v-for="(reward, rewardIndex) in rewards" :key="rewardIndex" class="reward-info">
          {{ reward.name }} : {{ reward.type=="jingdou"?item.jingdou||0 :item.fenrunzhi ||0}} 
         </view>

shop/perating/statement.vue

@@ -111,7 +111,7 @@
             dataList.fenrunzhi == undefined ? 0 : dataList.fenrunzhi
           }}
         </view>
-        <view class="sf"> 贡献值 </view>
+        <view class="sf"> 分润值 </view>
       </view>
       <!-- <view class="yis">
         <view class="sgjd">