zhangqiOMG 2 years ago
parent
commit
3cf855e802

+ 2 - 3
Eservice/api/http.js

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

+ 2 - 1
Eservice/nodeDetail/index.json

@@ -7,6 +7,7 @@
     "t-tab-panel": "tdesign-miniprogram/tab-panel/tab-panel",
     "sign-name":"../components/signName/index",
     "product-card": "../components/productCard/index",
-    "menber-card": "../components/menberCard/index"
+    "menber-card": "../components/menberCard/index",
+    "image-viewer":"../components/imageViewer/index"
   }
 }

+ 1 - 0
Eservice/nodeDetail/index.wxml

@@ -48,6 +48,7 @@
     <card>
       <view style="flex:1" slot="content">
         <upload id="upload" bindData="{{bindNormalData}}"></upload>
+        <!-- <image-viewer list="{{list}}"></image-viewer> -->
       </view>
     </card>
   </view>

+ 1 - 1
Eservice/workOrder/index.wxml

@@ -30,7 +30,7 @@
           {{item.status}}
         </view>
         <view wx:if="{{item.status !== '待接单'}}" class="colorInfo small">
-          当前工序:{{item.now}}
+          当前工序:{{item.curcontent}}
         </view>
       </view>
       <view class="flex-align-center" slot="right">

+ 1 - 1
app.js

@@ -73,6 +73,6 @@ App({
             that: null, //保存this
             callback: function () {}
         },
-        host:"http://122.226.136.204:8082"
+        host:"http://61.164.207.46:8000"
     }
 })

+ 2 - 2
utils/Http.js

@@ -1,6 +1,6 @@
 // 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";
 
 class HTTP {
     request({