代码上传

Eservice/api/http.js

@@ -1,14 +1,8 @@
 var app = getApp(); //引入全局app.js，我们可以在globalData中定义一些公用的数据，比如baseUrl、token
 
 const request = function (url = "", options) {
-<<<<<<< HEAD
   const baseUrl = "http://61.164.207.46:8000/yos/rest/index" + url;
   // const baseUrl = "http://122.226.136.204:8082/yos/rest/index" + url;
-=======
-  // const baseUrl = "http://61.164.207.46:8000/yos/rest/index" + url;
-  const baseUrl = "http://122.226.136.204:8082/yos/rest/index" + url;
-  // const baseUrl = "https://oms.idcgroup.com.cn:8079/yos/rest/index" + url;
->>>>>>> 6d50bfc48456f82407384374f3ff23da1be150a5
   options.data.accesstoken = wx.getStorageSync('userMsg').token
   return new Promise((resolve, reject) => {
     wx.request({

Eservice/saler/serviceBillDetail/index.wxml

@@ -68,7 +68,7 @@
 <view>
   <t-tabs defaultValue="{{0}}" bind:change="onTabsChange" bind:click="onTabsClick" t-class="custom-tabs">
     <t-tab-panel label="关联工单" value="0">
-      <t-cell wx:for="{{linkWorkOrders}}" wx:key="sa_serviceorderid" title="工单编号" bind:click="tolinkWorkOrder" note="{{item.billno}}" hover arrow />
+      <t-cell wx:for="{{linkWorkOrders}}" wx:key="sa_serviceorderid" title="工单编号" bind:click="tolinkWorkOrder" data-item="{{item}}" note="{{item.billno}}" hover arrow />
     </t-tab-panel>
     <t-tab-panel wx:if="{{orderMainData.servicetype !== '售前' && orderMainData.servicetype !== '历史售后'}}" label="售后商品" value="1">
       <view style="padding:10px" wx:if="{{list.length === 0}}">

app.js

@@ -57,10 +57,6 @@ App({
             that: null, //保存this
             callback: function () {}
         },
-<<<<<<< HEAD
         host:"http://61.164.207.46:8000"
-=======
-        host: "https://oms.idcgroup.com.cn:8079"
->>>>>>> 6d50bfc48456f82407384374f3ff23da1be150a5
     }
 })

utils/Http.js

@@ -1,12 +1,6 @@
-<<<<<<< HEAD
 // const baseUrl = "https://meida.cnyunl.com/yos/rest/index";
 const baseUrl = "http://61.164.207.46:8000/yos/rest/index";
 // const baseUrl = "http://122.226.136.204:8082/yos/rest/index";
-=======
-// const baseUrl = "http://61.164.207.46:8000/yos/rest/index";
-const baseUrl = "http://122.226.136.204:8082/yos/rest/index";
-// const baseUrl = "https://oms.idcgroup.com.cn:8079/yos/rest/index";
->>>>>>> 6d50bfc48456f82407384374f3ff23da1be150a5
 
 class HTTP {
     request({