Merge branch '应用tab权限' into 测试

# Conflicts:
#	project.private.config.json

packageA/contract/detail.wxml

@@ -13,9 +13,11 @@
     <Preview slot='详细信息' list1='{{list1}}' list2='{{list2}}' />
     <Trace slot='跟进动态' id='Trace' ownertable='sa_contract' ownerid='{{detail.sa_contractid}}' />
     <Work slot='任务' id='Work' ownertable='sa_contract' ownerid='{{detail.sa_contractid}}' disabled="{{isAdmin||isLeader}}" />
-    <PiscountProduct wx:if="{{detail.type=='经销商合作协议'||detail.type=='直销客户合作协议'}}" slot='产品明细折扣' id='PiscountProduct' disabled="{{(per.query(options,'app')||isAdmin||isLeader)&&detail.status!='新建'}}" />
-    <Product wx:else slot='{{detail.type=="工具使用(借用)协议"?  "工具清单": "产品明细折扣"}}' synchronous='{{detail.type=="经销项目协议" && isLeader && detail.status=="新建"}}' disabled="{{(per.query(options,'app')||isAdmin||isLeader)&&detail.status!='新建'}}" id='Product' />
-    <PiscountType slot='产品类别折扣' id='PiscountType' synchronous='{{detail.type=="经销项目协议" && isLeader && detail.status=="新建"}}' disabled="{{(per.query(options,'app')||isAdmin||isLeader)&&detail.status!='新建'}}" />
+
+    <PiscountProduct wx:if="{{detail.type=='经销商合作协议'||detail.type=='直销客户合作协议'}}" slot='产品明细折扣' id='PiscountProduct' disabled="{{(isAdmin||isLeader)&&detail.status!='新建'}}" />
+    <Product wx:else slot='{{detail.type=="工具使用(借用)协议"?  "工具清单": "产品明细折扣"}}' synchronous='{{detail.type=="经销项目协议" && isLeader && detail.status=="新建"}}' disabled="{{(isAdmin||isLeader)&&detail.status!='新建'}}" id='Product' />
+    <PiscountType slot='产品类别折扣' id='PiscountType' synchronous='{{detail.type=="经销项目协议" && isLeader && detail.status=="新建"}}' disabled="{{(isAdmin||isLeader)&&detail.status!='新建'}}" />
+
     <Objective slot='业绩目标' id='Objective' />
     <Record slot="操作记录" id="Record" ownertable='sa_contract' ownerid='{{detail.sa_contractid}}' />
     <!-- <view slot='合同条款' /> -->

packageA/contract/modules/discount/product/index.wxml

@@ -4,7 +4,7 @@
         <!-- <navigator url="#" class="but">
             <van-icon name="search" />
         </navigator> -->
-        <navigator wx:if="{{!disabled}}" url="#" class="but" bindtap="addProduct">
+        <navigator wx:if="{{disabled}}" url="#" class="but" bindtap="addProduct">
             <van-icon name="plus" />
         </navigator>
     </view>

packageA/contract/modules/discount/type/index.wxml

@@ -4,7 +4,7 @@
         <navigator wx:if="{{synchronous}}" url="#" class="but" bindtap="openSynchronous">
             <text class="iconfont icon-tongbuhezuoxieyi" />
         </navigator>
-        <navigator wx:if="{{!disabled}}" url="#" class="but" bindtap="addType">
+        <navigator wx:if="{{disabled}}" url="#" class="but" bindtap="addType">
             <van-icon name="plus" />
         </navigator>
     </view>

packageA/contract/modules/product/index.wxml

@@ -4,7 +4,7 @@
         <navigator wx:if="{{synchronous}}" url="#" class="but" bindtap="openSynchronous">
             <text class="iconfont icon-tongbuhezuoxieyi" />
         </navigator>
-        <navigator wx:if="{{!disabled}}" url="#" class="but" bindtap="addProduct">
+        <navigator wx:if="{{disabled}}" url="#" class="but" bindtap="addProduct">
             <van-icon name="plus" />
         </navigator>
     </view>

packageA/offers/modules/pettyExpense/index.wxml

@@ -3,7 +3,7 @@
         <view class="head">
             <view class="count">费用</view>
             <view class="expand">
-                <navigator wx:if="{{!disabled}}" url="#" class="but" bindtap="addExpense">
+                <navigator wx:if="{{disabled}}" url="#" class="but" bindtap="addExpense">
                     <van-icon name="plus" />
                 </navigator>
             </view>

packageA/setclient/detail.wxml

@@ -34,7 +34,7 @@
     <Offers slot='报价单' id='Offers' disabled="{{per.query(options,'offer')||isAdmin||isLeader}}" />
     <Contract slot='合同' id='Contract' />
     <Account slot='账户余额' id='Account' />
-    <Bankcard slot='银行卡信息' id="Bankcard" />
+    <Bankcard slot='银行卡信息' id="Bankcard" disabled="{{isAdmin||isLeader}}" />
     <Financing slot='开票信息' id="Financing" disabled="{{per.query(options,'invoice')||isAdmin||isLeader}}" />
     <Record slot="操作" id="Record" ownertable='sa_customers' ownerid='{{sa_customersid}}' />
     <Files slot="附件" id="Files" ownertable='sa_customers' ownerid='{{sa_customersid}}' />

packageA/setclient/modules/bankcard/index.wxml

@@ -3,10 +3,9 @@
 		总共{{content.total}}个
 	</view>
 	<view class="expand">
-		<navigator url="#" class="but" bindtap="addOffers">
+		<navigator wx:if="{{disabled}}" url="#" class="but" bindtap="addOffers">
 			<van-icon name="plus" />
 		</navigator>
 	</view>
 </view>
-<!-- wx:if="{{disabled}}" -->
 <list list='{{list}}' disabled='{{disabled}}' bind:deleteItem="deleteItem" />

project.private.config.json

@@ -78,14 +78,7 @@
                     "scene": null
                 },
                 {
-                    "name": "",
-                    "pathName": "pages/group/index",
-                    "query": "item=%7B%22ownertable%22%3A%22sa_customers%22%2C%22ownerid%22%3A%223768%22%7D",
-                    "launchMode": "default",
-                    "scene": null
-                },
-                {
-                    "name": "9090",
+                    "name": "123123",
                     "pathName": "packageA/setclient/detail",
                     "query": "id=3768",
                     "launchMode": "default",