Merge branch 'liuquan' of http://git.xiaodongai.com/WechatMiniProgram/XDJK into test

packageA/addsite/addsite.js

@@ -11,12 +11,16 @@ Page({
 		phone: '',
 		take_over: ['请选择', '', ''],
 		detail_address: '',
+		type:0
 	},
 	/**
 	 * 生命周期函数--监听页面加载
 	 */
 	onLoad: function (options) {
 		let that = this;
+		if(options.type){
+			that.data.type=options.type;
+		}
 		if(options.ordernumber){
 			that.data.ordernumber=options.ordernumber;
 		}
@@ -48,9 +52,9 @@ Page({
 		let item = wx.getStorageSync('data');
 		//id不为空属于修改
 		if (that.data.id != '') {
-			console.log(2)
 			let data = {};
-			data.id = that.data.id
+			data.id = that.data.id;
+			data.type=that.data.type;
 			data.name = e.detail.value.name;
 			data.phone = e.detail.value.phone;
 			if(data.take_over=='请选择'){

packageA/drugOrder/drugOrder.js

@@ -221,7 +221,7 @@ Page({
 		}).then((res) => {
 			if (res.code == 1) {
 				wx.navigateTo({
-					url: '/packageA/addsite/addsite?item=' + JSON.stringify(e.currentTarget.dataset.address) + '&ordernumber=' + e.currentTarget.dataset.ordernumber + '&type=1',
+					url: '/packageA/addsite/addsite?item=' + JSON.stringify(e.currentTarget.dataset.address) + '&ordernumber=' + e.currentTarget.dataset.ordernumber,
 				})
 			} else {
 				wx.showToast({

packageA/productOrderDetail/productOrderDetail.wxml

@@ -98,7 +98,7 @@
 	</view>
 	<view class="row order-freight">
 		<view>运费：</view>
-		<view wx:if="{{item.freight}}">￥ {{item.freight}}</view>
+		<view wx:if="{{item.freight&&item.freight!='0.00'}}">￥ {{item.freight}}</view>
 		<view wx:else >包邮</view>
 	</view>
 	<view class="actualPay">共{{item.drug_num}}件商品 实付款: <text style="color:#EC5B68;">￥{{item.money}}</text></view>

project.private.config.json

@@ -80,7 +80,7 @@
         {
           "name": "packageA/productOrderInfo/productOrderInfo",
           "pathName": "packageA/productOrderInfo/productOrderInfo",
-          "query": "scene=15152",
+          "query": "scene=15164",
           "scene": 1011
         },
         {

utils/config.js

@@ -7,8 +7,8 @@ const HOST_P         = "https://static.xiaodongai.com/xiaodongai/";
 const HOST_P_K       = "https://static.xiaodongai.com/xiaodongai/kongtian/";
 
 // const HOST        = "https://test-wechat.xiaodongai.com/";
-const HOST           = 'https://www.xiaodongai.com/xiaodongai/kongtian/';
-// const HOST        = 'https://www.xiaodongai.com/xiaodongai/ceshi/';        //测试库
+// const HOST           = 'https://www.xiaodongai.com/xiaodongai/kongtian/';
+const HOST        = 'https://www.xiaodongai.com/xiaodongai/ceshi/';        //测试库
 // var HOST          = 'http://192.168.0.123:8081/xiaodongai/ceshi/';         //本地
 // var HOST          = 'http://localhost/xiaodongai/kongtian/';               //本地
 const patient        = "http://test.patient.xiaodongai.com/"                  //测试新地址

utils/tim.js

@@ -3,13 +3,13 @@ import TIM from 'tim-wx-sdk';
 import COS from "cos-wx-sdk-v5";
 const Util = require('./util.js');
 /**正式IMSDKAppID */
-let options = {
-  SDKAppID: 1400103358 // 接入时需要将0替换为您的即时通信 IM 应用的 SDKAppID
-}; 
-/**测试IMSDK */
 // let options = {
-//   SDKAppID: 1400407697 // 接入时需要将0替换为您的即时通信 IM 应用的 SDKAppID
-// };
+//   SDKAppID: 1400103358 // 接入时需要将0替换为您的即时通信 IM 应用的 SDKAppID
+// }; 
+/**测试IMSDK */
+let options = {
+  SDKAppID: 1400407697 // 接入时需要将0替换为您的即时通信 IM 应用的 SDKAppID
+};
 // 创建 SDK 实例，`TIM.create()`方法对于同一个 `SDKAppID` 只会返回同一份实例
 const tim = TIM.create(options); // SDK 实例通常用 tim 表示
 const data = {