wesley.chen před 7 roky
rodič
revize
a2011d43d5

+ 0 - 0
Furniture/images/查进度.png → Furniture/images/chajindu.png


+ 0 - 0
Furniture/images/更多按钮.png → Furniture/images/gengduoanniu.png


+ 0 - 0
Furniture/images/家具搭配框架.png → Furniture/images/jiajudapei.png


+ 0 - 0
Furniture/images/家具画册.png → Furniture/images/jiajuhuace.png


+ 0 - 0
Furniture/images/家具售后.png → Furniture/images/jiajushouhou.png


+ 0 - 0
Furniture/images/秒杀按钮.png → Furniture/images/miaoshaanniu.png


+ 0 - 0
Furniture/images/拼团按钮.png → Furniture/images/pingtuananniu.png


+ 0 - 0
Furniture/images/收起按钮.png → Furniture/images/shouqianniu.png


+ 0 - 0
Furniture/images/搜索.png → Furniture/images/sousuo.png


+ 0 - 0
Furniture/images/特惠按钮.png → Furniture/images/tehuianniu.png


+ 0 - 0
Furniture/images/weather/多云.png → Furniture/images/weather/duoyun.png


+ 0 - 0
Furniture/images/weather/晴.png → Furniture/images/weather/qing.png


+ 0 - 0
Furniture/images/weather/阴天.png → Furniture/images/weather/ying.png


+ 0 - 0
Furniture/images/weather/中雨.png → Furniture/images/weather/yu.png


+ 0 - 0
Furniture/images/weather/阵雨.png → Furniture/images/weather/zhenyu.png


+ 0 - 0
Furniture/images/新品按钮.png → Furniture/images/xinpinganniu.png


+ 0 - 0
Furniture/images/新品发布.png → Furniture/images/xinpingfabu.png


+ 0 - 0
Furniture/images/新品发布框架.png → Furniture/images/xinpingfabukuangjia.png


+ 0 - 0
Furniture/images/新闻咨询.png → Furniture/images/xinwenzixun.png


+ 1 - 0
Furniture/page/homePage/homePage.js

xqd
@@ -29,6 +29,7 @@ Page({
     var myAmapFun = new amapFile.AMapWX({ key: 'f74da0d1484bbbefb69059efa771b01d' });
     myAmapFun.getWeather({
       success: function (data) {
+        console.log(data)
         that.setData({
           weather:data.weather.data,
           temp: data.temperature.data,

+ 19 - 15
Furniture/page/homePage/homePage.wxml

xqd xqd xqd xqd
@@ -11,7 +11,7 @@
       </block>
     </swiper>
     <view class="relative">
-      <image class="pic_background" src="../../images/搜索.png"></image>
+      <image class="pic_background" src="../../images/sousuo.png"></image>
       <view class="container">
         现代简约沙发
       </view>
@@ -19,7 +19,11 @@
         |{{ weather }}
       </view>
       <view class='container' style='margin-left:560rpx'>
-        <image src="../../images/weather/{{weather}}.png" style='margin-top:0rpx;width:40rpx;height:40rpx'></image>
+        <image wx:if="{{weather=='多云'}}" src="../../images/weather/duoyun.png" style='margin-top:0rpx;width:40rpx;height:40rpx'></image>
+        <image wx:if="{{weather=='晴'}}" src="../../images/weather/qing.png" style='margin-top:0rpx;width:40rpx;height:40rpx'></image>
+        <image wx:if="{{weather=='阵雨'}}" src="../../images/weather/zhenyu.png" style='margin-top:0rpx;width:40rpx;height:40rpx'></image>
+        <image wx:if="{{weather!='多云'&&weather!='晴'&&weather!='阴'&&weather!='阵雨'}}" src="../../images/weather/yu.png" style='margin-top:0rpx;width:40rpx;height:40rpx'></image>
+       
       </view>
       <view class="container" style="margin-left:600rpx;color:#1E90FF;margin-top:20rpx">
         {{ temp }}°
@@ -30,36 +34,36 @@
     <view class='weui-flex' style='border-bottom: 2rpx #D3D3D3 solid'>
       <view class='weui-flex__item'>
        <navigator target="miniProgram" open-type="navigate" app-id="wx605448628d21d682" path="/pages/index/index" extra-data="" version="release">
-          <image src='../../images/家具画册.png' style='height:215rpx;width:100%;margin:20rpx;margin-top:0;'></image>
+          <image src='../../images/jiajuhuace.png' style='height:215rpx;width:100%;margin:20rpx;margin-top:0;'></image>
          </navigator>
       </view>
       <view class='weui-flex__item' style='margin-left:45rpx;'>
-        <image src='../../images/家具售后.png' style='height:100rpx;width:90%;margin-top:0;'></image>
-        <image src='../../images/查进度.png' style='height:100rpx;width:90%;'></image>
+        <image src='../../images/jiajushouhou.png' style='height:100rpx;width:90%;margin-top:0;'></image>
+        <image src='../../images/chajindu.png' style='height:100rpx;width:90%;'></image>
       </view>
     </view>
     <view class="relative" style='border-bottom: 2rpx #D3D3D3 solid'>
-      <image class="pic_background" src="../../images/新闻咨询.png"></image>
+      <image class="pic_background" src="../../images/xinwenzixun.png"></image>
       <view class="container" style='color:#000;margin-left:270rpx'>
         {{ sysinfo.notice }}
       </view>
     </view>
     <view class='weui-flex' style='border-bottom: 2rpx #D3D3D3 solid'>
       <view class='weui-flex__item'>
-        <image src='../../images/新品按钮.png' style='height:110rpx;width:40%;margin-left:30%;margin-top:10rpx'></image>
+        <image src='../../images/xinpinganniu.png' style='height:110rpx;width:40%;margin-left:30%;margin-top:10rpx'></image>
       </view>
       <view class='weui-flex__item'>
-        <image src='../../images/特惠按钮.png' style='height:110rpx;width:40%;margin-left:30%;margin-top:10rpx'></image>
+        <image src='../../images/tehuianniu.png' style='height:110rpx;width:40%;margin-left:30%;margin-top:10rpx'></image>
       </view>
       <view class='weui-flex__item'>
-        <image src='../../images/拼团按钮.png' style='height:110rpx;width:40%;margin-left:30%;margin-top:10rpx'></image>
+        <image src='../../images/pingtuananniu.png' style='height:110rpx;width:40%;margin-left:30%;margin-top:10rpx'></image>
       </view>
       <view class='weui-flex__item'>
-        <image src='../../images/秒杀按钮.png' style='height:110rpx;width:40%;margin-left:30%;margin-top:10rpx'></image>
+        <image src='../../images/miaoshaanniu.png' style='height:110rpx;width:40%;margin-left:30%;margin-top:10rpx'></image>
       </view>
     </view>
     <view class="relative" style='height:360rpx;border-bottom: 2rpx #D3D3D3 solid'>
-      <image class="pic_background" src="../../images/家具搭配框架.png"></image>
+      <image class="pic_background" src="../../images/jiajudapei.png"></image>
       <scroll-view  class="marketlist" scrollX="true">
         <view class="marketlist_one" wx:for="{{goods}}" wx:key="{{item.value}}">
           <image mode="aspectFill" src="{{item.img}}" style="border-radius:10rpx;"></image>
@@ -68,19 +72,19 @@
       </scroll-view>
     </view>
     <view class="relative" style='height:70rpx;border-bottom: 2rpx #D3D3D3 solid'>
-      <image class="pic_background" src="../../images/新品发布.png"></image>
+      <image class="pic_background" src="../../images/xinpingfabu.png"></image>
       <view class="container" wx:if="{{takeup}}">
-        <image src='../../images/收起按钮.png' style='height:28rpx;width:80rpx;margin-left:500rpx' bindtap='takeup'></image>
+        <image src='../../images/shouqianniu.png' style='height:28rpx;width:80rpx;margin-left:500rpx' bindtap='takeup'></image>
       </view>
       <view class="container" wx:if="{{more}}">
-        <image src='../../images/更多按钮.png' style='height:28rpx;width:80rpx;margin-left:500rpx' bindtap='more'></image>
+        <image src='../../images/gengduoanniu.png' style='height:28rpx;width:80rpx;margin-left:500rpx' bindtap='more'></image>
       </view>
     </view>
     <view wx:if="{{takeup}}">
 
      <block wx:for="{{news}}" wx:key="{{index1}}" wx:for-item="item" wx:for-index="index1" >
       <view class="relative" style='height:200rpx;border-bottom: 2rpx #D3D3D3 solid' bindtap='toDetail'>
-        <image class="pic_background" src="../../images/新品发布框架.png"></image>
+        <image class="pic_background" src="../../images/xinpingfabukuangjia.png"></image>
         <view class="container" style='width:400rpx;color:#000;font-size:33rpx;margin-left:30rpx'>
           {{ item.title}}
         </view>