Merge branch 'master' of http://116.63.33.55/git/nazw

nngkxxdp/src/main/resources/static/nnzwminiapp/app.json

@@ -2,7 +2,8 @@
 	"pages": [
 		"pages/index/index",
 		"pages/customerServe/customerServe",
-    	"pages/ZCWDK/add/add",
+		"pages/ZCWDK/add/add",
+		"pages/ZCWDK/index/index",
 		"pages/nais/nais",
 		"pages/dataCenterZWTJ/dataCenterZWTJ",
 		"pages/login/login",

nngkxxdp/src/main/resources/static/nnzwminiapp/custom-tab-bar/index.js

@@ -45,10 +45,6 @@ Component({
 		switchTab(e) {
 			const data = e.currentTarget.dataset
 			const url = data.path
-			
-			
-			console.log("sss"+this.data.selected);
-			console.log("ttt"+data.index);
 			this.setData({
 				selected: data.index
 			})

nngkxxdp/src/main/resources/static/nnzwminiapp/custom-tab-bar/index.wxss

@@ -17,7 +17,7 @@
 	left: 0;
 	top: 0;
 	width: 100%;
-	height: 1px;
+	height: 1rpx;
 	transform: scaleY(0.5);
   }
   

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/deliciousList/deliciousList.js

@@ -1,10 +1,14 @@
 // pages/deliciousList.js
+import {
+	imgUrl
+} from "../api/request"
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
+	imgUrl:imgUrl,
     tab: 0,
     item: ''
   },

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/deliciousList/deliciousList.wxml

@@ -1,6 +1,6 @@
 <!--pages/deliciousList.wxml-->
 <view class="head-bg">
-  <image style="width:100%" src="/pages/images/list_bg.png"></image>
+  <image style="width:100%" src="{{imgUrl}}list_bg.png"></image>
 </view>
 <view class="tab">
   <view class="tab-item {{tab==0?'active':''}}" bindtap="changeItem" data-item="0">
@@ -17,7 +17,7 @@
       <scroll-view scroll-y="true" style="height: 100%;padding:0;margin:0;">
         <view class="content">
           <view class="cont-width first">
-            <view class="cont-bg" style="background-image: url(/pages/images/cont_bg.png);">
+            <view class="cont-bg" style="background-image: url({{imgUrl}}cont_bg.png);">
               <view class="number" style="background-image: url(/pages//images/top1.png);">
                 <view>TOP</view>
                 <view>——</view>
@@ -42,7 +42,7 @@
             </view>
           </view>
           <view class="cont-width second">
-            <view class="cont-bg" style="background-image: url(/pages/images/cont_bg.png);">
+            <view class="cont-bg" style="background-image: url({{imgUrl}}cont_bg.png);">
               <view class="number" style="background-image: url(/pages//images/top2.png);">
                 <view>TOP</view>
                 <view>——</view>
@@ -70,7 +70,7 @@
       <scroll-view scroll-y="true" style="height: 100%">
         <view class="content">
           <view class="cont-width first">
-            <view class="cont-bg" style="background-image: url(/pages/images/cont_bg.png);">
+            <view class="cont-bg" style="background-image: url({{imgUrl}}cont_bg.png);">
               <view class="number" style="background-image: url(/pages//images/top1.png);">
                 <view>TOP</view>
                 <view>——</view>
@@ -95,7 +95,7 @@
             </view>
           </view>
           <view class="cont-width second">
-            <view class="cont-bg" style="background-image: url(/pages/images/cont_bg.png);">
+            <view class="cont-bg" style="background-image: url({{imgUrl}}cont_bg.png);">
               <view class="number" style="background-image: url(/pages//images/top2.png);">
                 <view>TOP</view>
                 <view>——</view>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ourCanteen/canteen.wxml

@@ -3,7 +3,7 @@
 
     <view class="cont-width first" bindtap="toMenu" wx:for="{{data}}">
         <view class="cont-bg">
-            <image style="height: 100%;width:100%" mode="scaleToFill" src="/pages/images/cont_bg.png"></image>
+            <image style="height: 100%;width:100%" mode="scaleToFill" src="{{imgUrl}}cont_bg.png"></image>
         </view>
         <view class="cont-name">
             <view class="title">A区食堂</view>
@@ -16,7 +16,7 @@
     </view>
     <view class="cont-width second" bindtap="toMenu">
         <view class="cont-bg">
-            <image style="height: 100%;width:100%;" mode="scaleToFill" src="/pages/images/cont_bg.png"></image>
+            <image style="height: 100%;width:100%;" mode="scaleToFill" src="{{imgUrl}}cont_bg.png"></image>
         </view>
         <view class="cont-name">
             <view class="title">A区食堂</view>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ourCanteen/notice.wxml

@@ -1,4 +1,4 @@
-<view style="width:100%;padding:0;margin:0;background-image: url(/pages/images/nontice_bg.png);background-size: 100% 100%;">
+<view style="width:100%;padding:0;margin:0;background-image: url({{imgUrl}}nontice_bg.png);background-size: 100% 100%;">
   <view class="notice-content">
     <view class="text">
       <view>1.粮食就是生命，知识拯救灵魂。</view>

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ourCanteen/ourCanteen.js

@@ -1,10 +1,14 @@
 // pages/ourCanteen/index.js
+import {
+	imgUrl
+} from "../api/request"
 Page({
 
   /**
    * 页面的初始数据
    */
   data: {
+	imgUrl:imgUrl,
     tab: 0,
     item: '',
     canteenList:[],

nngkxxdp/src/main/resources/static/nnzwminiapp/pages/ourCanteen/ourCanteen.wxml

@@ -1,5 +1,5 @@
 <view class="head-bg">
-      <image style="width:100%;height:100%" mode="scaleToFill" src="/pages/images/index_bg.png"></image>
+      <image style="width:100%;height:100%" mode="scaleToFill" src="{{imgUrl}}index_bg.png"></image>
 </view>
 <view class="tab">
       <view class="tab-item {{tab==0?'active':''}}" bindtap="changeItem" data-item="0">