1

pages/accountRecord/index.wxml

@@ -8,7 +8,7 @@
     <tui-list-cell hover="{{false}}">
       <view class="tui-line-cell">
         <view class="tui-title">总额</view>
-        <label class="tui-lable">{{totalAmount/100}}元</label>
+        <label class="tui-lable">{{totalAmount}}元</label>
       </view>
     </tui-list-cell>
 
@@ -29,7 +29,7 @@
 						</view>
 					</view>
 					<view class="tui-msg-right">
-						<view class="tui-msg-time" style="color:red;font-size:28rpx;font-weight:800;">{{list[index].number/100}}元</view> 
+						<view class="tui-msg-time" style="color:red;font-size:28rpx;font-weight:800;">{{list[index].number}}元</view> 
 					</view> 
 				</tui-cell>
 			</block>

pages/index/index.wxml

@@ -12,7 +12,7 @@
         销售金额（元）
       </view>
       <view class="padding-xs">
-        {{statisData.productSellPrice==null?0:statisData.productSellPrice/100}}
+        {{statisData.productPrice==null?0:statisData.productPrice}}
       </view>
     </view>
 
@@ -30,13 +30,13 @@
           实际收款（元）
         </view>
         <view class="padding-xs" wx:if="{{userInfo.mgvmRole==2}}">
-          {{statisData.storeCommission==null?0:statisData.storeCommission/100}}
+          {{statisData.storeCommission==null?0:statisData.storeCommission}}
         </view>
         <view class="padding-xs" wx:if="{{userInfo.mgvmRole==3}}">
-          {{statisData.agentMoney==null?0:statisData.agentMoney/100}}
+          {{statisData.agentMoney==null?0:statisData.agentMoney}}
         </view>
         <view class="padding-xs" wx:if="{{userInfo.mgvmRole==4}}">
-          {{statisData.areaAgentMoney==null?0:statisData.areaAgentMoney/100}}
+          {{statisData.areaAgentMoney==null?0:statisData.areaAgentMoney}}
         </view>
       </view>
     </view>
@@ -68,7 +68,7 @@
   </view>
 
   <view class="grid col-2">
-    <view wx:if="{{userInfo.mgvmRole!=1}}">
+    <view wx:if="{{userInfo.mgvmRole==0||userInfo.mgvmRole==3}}">
       <view class="margin-xs padding radius shadow-warp common-list-row"  bindtap="toRouter" data-url="/pages/vendingMachine/index">
         <view style="width:100%;">
           <view class="padding-bottom-sm common-name">售货机管理</view>
@@ -118,7 +118,7 @@
       </view>
     </view>
 
-    <view>
+    <view  wx:if="{{userInfo.mgvmRole==0||userInfo.mgvmRole==3}}">
       <view class="margin-xs padding radius shadow-warp common-list-row" bindtap="toRouter" data-url="/pages/operation/index">
         <view style="width:100%;">
           <view class="padding-bottom-sm common-name">运维管理</view>

pages/order/index.wxml

@@ -65,26 +65,34 @@
       </tui-list-cell>
       <tui-list-cell padding="0" bindclick="detail">
         <view class="tui-goods-item">
-          <image src="{{item.productImg}}" class="tui-goods-img"></image>
+          
+          <view class="tui-goods-left-bolck"></view>
+          <!-- <image src="{{item.productImg}}" class="tui-goods-img"></image> -->
           <view class="tui-goods-center">
             <view class="tui-goods-name">门店名称:{{item.storeName}}</view>
             <view class="tui-goods-name">商品名称:{{item.productName}}</view>
 
           </view>
           <view class="tui-price-right">
-            <view>￥{{filter.toDecimal2Penny(item.productSellPrice)}} </view>
+            <view>￥{{item.totalAmount}} </view>
           </view>
         </view>
       </tui-list-cell>
       <tui-list-cell hover="{{false}}" last="{{true}}">
         <view class="tui-goods-price">
-          <view> 金额：</view>
+          <view> 代理佣金</view>
           <view class="tui-size-24">￥</view>
-          <view class="tui-price-large"> {{filter.toDecimal2Penny(item.productSellPrice)}}</view>
+          <view class="tui-price-large"> {{item.agentMoney}} </view>
           <!-- <view class="tui-size-24">.00</view> -->
         </view>
         <view class="tui-goods-price">
-          <view> 门店佣金：</view>
+          <view> 区代佣金</view>
+          <view class="tui-size-24">￥</view>
+          <view class="tui-price-large">{{filter.toDecimal2Penny(item.areaAgentMoney)}}</view>
+          <!-- <view class="tui-size-24">.00</view> -->
+        </view>
+        <view class="tui-goods-price">
+          <view> 门店佣金</view>
           <view class="tui-size-24">￥</view>
           <view class="tui-price-large">{{filter.toDecimal2Penny(item.storeCommission)}}</view>
           <!-- <view class="tui-size-24">.00</view> -->

pages/order/index.wxss

@@ -181,6 +181,13 @@
 	flex-shrink: 0;
 }
 
+.tui-goods-left-bolck {
+	width: 50rpx;
+	height: 100rpx;
+	display: block;
+	flex-shrink: 0;
+}
+
 .tui-goods-center {
 	flex: 1;
 	padding: 20rpx 8rpx;
@@ -188,7 +195,7 @@
 }
 
 .tui-goods-name {
-	max-width: 310rpx;
+	max-width: 420rpx;
 	word-break: break-all;
 	overflow: hidden;
 	text-overflow: ellipsis;

pages/store/index.wxml

@@ -9,8 +9,8 @@
     </view>
   </view>
 
-  <view class="bg-white store-grid">
-    <view class="grid col-2">
+  <view class="store-grid">
+    <view class="grid col-2"  style="margin-bottom:100rpx">
       <block wx:for="{{storeList}}">
       <view>
         <view class="margin-sm padding-sm radius shadow-warp store-list-row" bindtap="toDetail" data-id="{{item.id}}">

pages/store/index.wxss

@@ -8,7 +8,7 @@ page{
   padding-bottom: calc(env(safe-area-inset-bottom) / 2 + 100rpx);
 }
 .store-grid{
-  height: 100%;
+  background-color: #ffffff;
 }
 .store-list-row{
   display: flex;

pages/total/index.js

@@ -186,14 +186,14 @@ Page({
         
         
         if(this.data.userInfo.mgvmRole==3){
-          saleYdata.push(d.agentMoney==null?0:d.agentMoney/100)
+          saleYdata.push(d.agentMoney==null?0:d.agentMoney)
         }else if(this.data.userInfo.mgvmRole==2){
-          saleYdata.push(d.storeCommission==null?0:d.storeCommission/100)
+          saleYdata.push(d.storeCommission==null?0:d.storeCommission)
         }else if(this.data.userInfo.mgvmRole==0){
           console.log(d.productSellPrice)
-          saleYdata.push(d.productSellPrice==null?0:d.productSellPrice/100)
+          saleYdata.push(d.productSellPrice==null?0:d.productSellPrice)
         }else if(this.data.userInfo.mgvmRole==4){
-          saleYdata.push(d.areaAgentMoney==null?0:d.areaAgentMoney/100)
+          saleYdata.push(d.areaAgentMoney==null?0:d.areaAgentMoney)
         }
         let createTime =  util.formatDate(d.createTime,'MM')+"-"+util.formatDate(d.createTime,'dd')
         saleXdata.push( createTime)