Merge branch 'master' of http://s.dev01.dkiboss.com:9001/iBOSS-2.0-Mini/iboss_wx_app

package-inventory/pages/ivt-detail-report/ivt-detail-report.wxml

@@ -64,8 +64,6 @@
   </view>
 </view> -->
 
-<view style="position: fixed;bottom: 230rpx;right: 30rpx;">
-	<view bind:tap="export" class="btn-add-class">
-		<van-icon name="share" color="#FFFFFF" size="60rpx" />
-	</view>
+<view  style="position: fixed;bottom: 230rpx;right: 30rpx;z-index: 99;" bindtap="export">
+  <image src="{{imageUrl + 'excel.png'}} " class="edit-class" />
 </view>

pages/login/login.js

@@ -84,9 +84,9 @@ Page({
     //   url = 'https://www.dongkesoft.com/public/index/changjian/news_info/id/102.html'
     // }
     if(e.currentTarget.dataset.type == 'user'){
-      url = 'https://zy.op.dkiboss.com/agreement-index?agId=10002024-0718-0000-0000-000005c0a01e'
+      url = config.knowledge_url +  '/agreement-index?agId=10002024-0718-0000-0000-000005c0a01e'
     }else{
-      url = 'https://zy.op.dkiboss.com/agreement-index?agId=10002024-0718-0000-0000-000005c145ff'
+      url = config.knowledge_url +  '/agreement-index?agId=10002024-0718-0000-0000-000005c145ff'
     }
     let toUrl = '/pages/product/product'
     if (url) {