Merge branch 'bug' into 测试

packageA/opponent/detail.wxml

@@ -22,7 +22,7 @@
 <Yl_FunTabs list='{{tabsList}}' active='{{tabsActive}}' bind:onChenge="tabsChange">
     <Preview slot='详细信息' list1='{{list1}}' list2='{{list2}}' />
     <Project slot='参与项目' id='Project' />
-    <Address slot='地址管理' id='Address' disabled="{{per.query(options,'address')||isShowTabbar}}" />
+    <Address slot='地址管理' id='Address' type='竞争对手' disabled="{{per.query(options,'address')||isShowTabbar}}" />
     <Contacts slot='联系人' id='Contacts' disabled="{{per.query(options,'contact')||isShowTabbar}}" path='/packageA/setclient/modules/contacts/add/index' />
     <Work slot='任务' id='Work' ownertable='sa_competitor' ownerid='{{detail.sa_competitorid}}' disabled="{{true}}" />
     <Trace slot='跟进动态' id='Trace' ownertable='sa_competitor' ownerid='{{detail.sa_competitorid}}' />

packageA/setclient/modules/address/add/index.js

@@ -59,12 +59,12 @@ Page({
         tags: []
     },
     onLoad(options) {
+        console.log(options)
         if (options.sys_enterpriseid) this.setData({
             "content.sys_enterpriseid": options.sys_enterpriseid
         })
         if (options.data) {
             let item = JSON.parse(options.data)
-            console.log(item)
             this.setData({
                 content: {
                     ...this.data.content,
@@ -92,6 +92,13 @@ Page({
                 tagList: res.data.option
             })
         })
+        if (options.type == '竞争对手') this.setData({
+            form: this.data.form.map(v => {
+                v.required = false
+                return v
+            }),
+            disabled:false
+        })
     },
     selectTag(e) {
         const {

packageA/setclient/modules/address/index.js

@@ -1,7 +1,13 @@
 const _Http = getApp().globalData.http;
 Component({
     properties: {
-        disabled: {type:Boolean}
+        disabled: {
+            type: Boolean
+        },
+        type: {
+            type: String,
+            value: "客户"
+        }
     },
     options: {
         addGlobalClass: true

packageA/setclient/modules/address/index.wxml

@@ -4,10 +4,10 @@
         <navigator url="#" class="but" bindtap="toSearch">
             <van-icon name="search" />
         </navigator>
-        <navigator wx:if="{{disabled}}" url="/packageA/setclient/modules/address/add/index?sys_enterpriseid={{sys_enterpriseid}}" class="but">
+        <navigator wx:if="{{disabled}}" url="/packageA/setclient/modules/address/add/index?sys_enterpriseid={{sys_enterpriseid}}&type={{type}}" class="but">
             <van-icon name="plus" />
         </navigator>
     </view>
 </view>
 
-<List id='List' list='{{list}}' disabled='{{disabled}}' bindchangeTotal='changeTotal' />
+<List id='List' list='{{list}}' disabled='{{disabled}}' type='{{type}}' bindchangeTotal='changeTotal' />

packageA/setclient/modules/address/list/index.js

@@ -4,9 +4,18 @@ Component({
         addGlobalClass: true
     },
     properties: {
-        list: {type:Array},
-        changeTotal: {type:Function},
-        disabled: {type:Boolean}
+        list: {
+            type: Array
+        },
+        changeTotal: {
+            type: Function
+        },
+        disabled: {
+            type: Boolean
+        },
+        type: {
+            type: String
+        }
     },
     data: {
         radio: 0, //默认
@@ -82,7 +91,7 @@ Component({
                     break;
                 case 'edit':
                     wx.navigateTo({
-                        url: '/packageA/setclient/modules/address/add/index?data=' + JSON.stringify(item),
+                        url: '/packageA/setclient/modules/address/add/index?data=' + JSON.stringify(item) + '&type=' + this.data.type,
                     })
                     break;
                 case 'delete':