1

pages/order/index.wxml

@@ -6,6 +6,7 @@
       <view class="search-form round">
         <text class="cuIcon-search"></text>
         <input type="text" placeholder="输入订单号" confirm-type="search" data-name="searchParams.orderSn" catchinput="inputedit"></input>
+        <input type="text" placeholder="输入订单号" confirm-type="search" data-name="searchParams.orderSn" catchinput="inputedit"></input>
       </view>
       <view class="action">
         <button class="cu-btn bg-blue shadow-blur round" bindtap="submitSearch">搜索</button>
@@ -59,15 +60,14 @@
     <view class="tui-order-item">
       <tui-list-cell hover="{{false}}" lineLeft="{{false}}" >
         <view class="tui-goods-title">
-          <view>订单号：{{item.orderSn}}</view>
+          <view>订单号：{{item.orderSn}}</view> 
           <view class="tui-order-status" >{{filter.orderStatus(item.status)}}</view>
         </view>
       </tui-list-cell>
       <tui-list-cell padding="0" bindclick="detail">
         <view class="tui-goods-item">
-          
           <view class="tui-goods-left-bolck"></view>
-          <!-- <image src="{{item.productImg}}" class="tui-goods-img"></image> -->
+          <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>

pages/orderGoods/order.wxml

@@ -58,7 +58,7 @@
     <view class="tui-order-item" wx:for="{{orderList}}">
       <tui-list-cell hover="{{false}}" lineLeft="{{false}}">
         <view class="tui-goods-title">
-          <view>订单号：{{item.orderSn}}</view>
+          <view>订单号：{{item.orderSn}}</view> 
           <view class="tui-order-status" style="color:red">{{filter.orderProductStatus(item.status)}}</view>
         </view>
       </tui-list-cell>

pages/product/index.wxml

@@ -25,8 +25,8 @@
             <view class="tui-goods-name">{{item.skuProductName}}</view>
             <view class="tui-goods-attr">商品售价（元）：<text style="color:red;">¥{{filter.toDecimal2Penny(item.productPrice)}}</text></view>
             <!-- <view class="tui-goods-attr">商品售价（元）：<text style="color:red;">¥{{filter.toDecimal2Penny(item.productPrice)}}</text></view> -->
-            <view class="tui-goods-attr">商品应用格子：
-        <tui-tag size="small" tui-tag-class="tui-mrbtm" wx:for="{{filter.gridList(item.productGrid)}}">{{item}}</tui-tag></view>
+            <!-- <view class="tui-goods-attr">商品应用格子：
+        <tui-tag size="small" tui-tag-class="tui-mrbtm" wx:for="{{filter.gridList(item.productGrid)}}">{{item}}</tui-tag></view> -->
           </view>
           <!-- <view class="tui-price-right">
             <button class="tui-btn tui-btn-small tui-warning tui-fillet"  bindtap="deleteProduct" data-id="{{item.id}}">删除</button> 

pages/scheme/form.js

@@ -101,15 +101,15 @@ Page({
       if(schemeBillEntryList[i].productId!=null&&schemeBillEntryList[i].productId!=""){
         schemeProduct.push(schemeBillEntryList[i])
         productCount+=1;
-        if(schemeBillEntryList[i].areaDivide==""||schemeBillEntryList[i].areaDivide==null){
+        if(schemeBillEntryList[i].areaDivide<0||schemeBillEntryList[i].storeDivide==null){
           util.toast('请输入代理分成')
           return;
         }  
         if(schemeBillEntryList[i].areaDivide<0||schemeBillEntryList[i].areaDivide>100){
-          util.toast('门店分成必须是0-100的分成')
+          util.toast('代理分成必须是0-100的分成')
           return;
         } 
-        if(schemeBillEntryList[i].storeDivide==""||schemeBillEntryList[i].storeDivide==null){
+        if(schemeBillEntryList[i].areaDivide<0||schemeBillEntryList[i].storeDivide==null){
           util.toast('请输入门店分成')
           return;
         }  
@@ -117,6 +117,10 @@ Page({
           util.toast('门店分成必须是0-100的分成')
           return;
         }  
+        if(schemeBillEntryList[i].storeDivide+schemeBillEntryList[i].areaDivide!=100){
+          util.toast('分成之和应为100%')
+          return;
+        }  
       }
     }
     if(productCount==0){

project.config.json

@@ -17,7 +17,7 @@
     "checkInvalidKey": true,
     "checkSiteMap": true,
     "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
+    "compileHotReLoad": true,
     "lazyloadPlaceholderEnable": false,
     "useMultiFrameRuntime": true,
     "useApiHook": true,