Browse Source

小程序版本更新

guotianliang 4 years ago
parent
commit
afd2da6e48

+ 0 - 1
components/spacecard/index.js

@@ -95,7 +95,6 @@ Component({
       let src = ev.currentTarget.dataset.src,
       width = ev.detail.width,
       height = ev.detail.height;
-      console.log(ev,width,height,src,"0.0.01231213")
     }
   }
 })

+ 0 - 1
miniprogram_npm/lottie-miniapp/component/lottie.js

@@ -49,7 +49,6 @@ Component({
     init: function init(animationData) {
       var width = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : this.properties.width;
       var height = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : this.properties.height;
-
       var data = animationData || this.properties.animationData;
       var dataPath = this.properties.path;
       if (!data && !dataPath) {

+ 1 - 1
pages/efficient/index.json

@@ -8,5 +8,5 @@
     "van-popup": "../../vant-weapp/dist/popup/index",
     "lottie": "../../miniprogram_npm/lottie-miniapp/component/lottie"
   },
-  "navigationBarTitleText": "关"
+  "navigationBarTitleText": "关闭空调"
 }

+ 1 - 1
pages/efficient/index.wxml

@@ -25,7 +25,7 @@
 				<cover-view>{{monthDay}} 恢复正常,</cover-view>
 				<cover-view bindtap="changeTime" class="detailtxtclick">点击修改</cover-view>
 			</cover-view>
-			<cover-view bindtap="openClose" class="custom_button">确定关</cover-view>
+			<cover-view bindtap="openClose" class="custom_button">确定关闭空调</cover-view>
 		</cover-view>
 	</cover-view>
 

File diff suppressed because it is too large
+ 38 - 749
pages/index/index.js


+ 6 - 6
pages/index/index.wxml

@@ -9,7 +9,7 @@
 	<view class="header_container">
 		<view class="header_box">
 		<!--  indicator-dots="true"  -->
-		<swiper duration="1000" circular="true" bindchange="swiperChange" current="{{swiperCurrent}}">
+		<swiper duration="1000" circular="true" indicatorDots="{{swiperDate&&swiperDate.length>1}}" bindchange="swiperChange" current="{{swiperCurrent}}" indicator-color="#e2e2eb" indicator-active-color="#5575ff">
 			<block wx:for="{{swiperDate}}" wx:key="index">
 				<swiper-item  bindtap="changePop" data-index="{{index}}">
 					<image src="{{item.initPic}}" wx:if="{{!item.imgShow||!item.pic}}"></image>
@@ -56,7 +56,7 @@
 	</view>
 	
 	<!-- 轮播图小点 -->
-	<swiper-dots swiperCurrent="{{swiperCurrent}}" swiperNum="{{swiperDate.length}}"></swiper-dots>
+	<!-- <swiper-dots swiperCurrent="{{swiperCurrent}}" swiperNum="{{swiperDate.length}}"></swiper-dots> -->
 	<!-- 按钮部分 -->
 	<view class="btn_list">
 		<view id="{{item.id}}" catchtap="itemClick" class="btn_item" wx:for='{{meauList}}' wx:key="index">
@@ -174,17 +174,17 @@
 					</view>
 					<view class="radiobox">
 					<van-radio-group value="{{addFollow}}" bind:change="addonChange" wx:if="{{!popswiperDate.subscribe}}">
-						<van-radio  name="1" shape="square">是否加入关注列表</van-radio>
+						<van-radio  name="1" shape="square">是否加入收藏</van-radio>
 					</van-radio-group>
-						<view wx:if="{{popswiperDate.subscribe}}">已加入关注列表</view>
+						<view wx:if="{{popswiperDate.subscribe}}">已加入收藏</view>
 					</view>
 				</view>
 				<!-- <view>是否加入关注列表</view> -->
 				<view class='submitbtn opencontent_openbtn ' bindtap="colseFeedback">关闭</view>
 			</view>
 			<view class="opencontent" wx:if="{{popswiperDate.isClose}}">
-				<view class="envstate">
-					<view  class="lottie"><lottie id="lottie" animationData="{{statusList[popswiperDate.stateId].canvasDate}}" width="25" height="25"/></view>
+				<view class="envstate" wx:if="{{statusList}}">
+					<view  class="lottie"><lottie id="lottie1" animationData="{{statusList[popswiperDate.stateId].canvasDate}}" width="25" height="25"/></view>
 					<!-- <image src="{{statusList[popswiperDate.stateId].imgSrc}}"></image> -->
 					{{popswiperDate.state}}
 				</view>

+ 5 - 3
pages/index/index.wxss

@@ -31,7 +31,7 @@
 
 .header_box swiper {
   position: relative;
-  height: 720rpx;
+  height: 754rpx;
 }
 
 .header_box image {
@@ -44,7 +44,7 @@
   height: 212rpx;
   display: flex;
   align-items: center;
-  padding: 0 52rpx;
+  padding: 0 10rpx 0 36rpx;
   justify-content: space-around;
   flex-wrap: wrap;
 }
@@ -146,7 +146,7 @@ border-radius: 48rpx;
 }
 
 .btn_item:nth-child(1) {
-  margin-top: 48rpx;
+  margin-top: 24rpx;
 }
 
 .btn_item>view:nth-child(2) {
@@ -201,6 +201,8 @@ border-radius: 48rpx;
 
 .space_title {
   text-align: center;
+  font-weight: 500;
+  font-size: 20px;
 }
 
 .item_list {

+ 1 - 1
pages/search/index.json

@@ -7,5 +7,5 @@
     "van-tabs": "../../vant-weapp/dist/tabs/index",
     "van-toast": "../../vant-weapp/dist/toast/index"
   },
-  "navigationBarTitleText": "关注列表"
+  "navigationBarTitleText": "收藏的空间"
 }

+ 1 - 1
pages/search/index.wxml

@@ -2,7 +2,7 @@
 <view>
 	<van-search shape="round" value="{{ spaceName }}" bind:search="spaceSearch" placeholder="请输入搜索关键词" />
 	<van-tabs type="card"  color="#5575ff" active="{{ activeTab }}" bind:change="tabChange">
-		<van-tab title="关注列表">
+		<van-tab title="我的收藏">
 		<!--  {{imgShow?'':'del_box'}} -->
 			<view class="cardlist">
 			<block wx:for="{{listContent}}" wx:key="index">

BIN
static/images/ic311.png


BIN
static/images/ic312.png


BIN
static/images/ic313.png


BIN
static/images/ic314.png


BIN
static/images/ic315.png


BIN
static/images/ic321.png


BIN
static/images/ic322.png


BIN
static/images/ic323.png


BIN
static/images/ic331.png


BIN
static/images/room.png


File diff suppressed because it is too large
+ 680 - 0
utils/icon.js


+ 1 - 0
utils/util.js

@@ -43,6 +43,7 @@ function checkHasLocationPermissionByMP() {
 function picInit(value){
 	let baseUrl="../../static/images/"
 	value = value || '';
+	return baseUrl + "room.png"
 	if(value.startsWith("300")||value.startsWith("310")||value.startsWith("311")){
 		return baseUrl + "ic311.png"
 	}else if(value.startsWith("312")){

+ 0 - 1
vant-weapp/dist/card/index.d.ts

@@ -1 +0,0 @@
-export {};

+ 0 - 49
vant-weapp/dist/card/index.js

@@ -1,49 +0,0 @@
-import { link } from '../mixins/link';
-import { VantComponent } from '../common/component';
-VantComponent({
-  classes: [
-    'num-class',
-    'desc-class',
-    'thumb-class',
-    'title-class',
-    'price-class',
-    'origin-price-class',
-  ],
-  mixins: [link],
-  props: {
-    tag: String,
-    num: String,
-    desc: String,
-    thumb: String,
-    title: String,
-    price: {
-      type: String,
-      observer: 'updatePrice',
-    },
-    centered: Boolean,
-    lazyLoad: Boolean,
-    thumbLink: String,
-    originPrice: String,
-    thumbMode: {
-      type: String,
-      value: 'aspectFit',
-    },
-    currency: {
-      type: String,
-      value: '¥',
-    },
-  },
-  methods: {
-    updatePrice() {
-      const { price } = this.data;
-      const priceArr = price.toString().split('.');
-      this.setData({
-        integerStr: priceArr[0],
-        decimalStr: priceArr[1] ? `.${priceArr[1]}` : '',
-      });
-    },
-    onClickThumb() {
-      this.jumpLink('thumbLink');
-    },
-  },
-});

+ 0 - 6
vant-weapp/dist/card/index.json

@@ -1,6 +0,0 @@
-{
-  "component": true,
-  "usingComponents": {
-    "van-tag": "../tag/index"
-  }
-}

+ 0 - 50
vant-weapp/dist/card/index.wxml

@@ -1,50 +0,0 @@
-<wxs src="../wxs/utils.wxs" module="utils" />
-
-<view class="custom-class van-card">
-  <view class="{{ utils.bem('card__header', { center: centered }) }}">
-    <view class="van-card__thumb" bind:tap="onClickThumb">
-      <image
-        wx:if="{{ thumb }}"
-        src="{{ thumb }}"
-        mode="{{ thumbMode }}"
-        lazy-load="{{ lazyLoad }}"
-        class="van-card__img thumb-class"
-      />
-      <slot name="thumb" />
-      <van-tag
-        wx:if="{{ tag }}"
-        mark
-        type="danger"
-        custom-class="van-card__tag"
-      >
-        {{ tag }}
-      </van-tag>
-    </view>
-
-    <view class="van-card__content {{ utils.bem('card__content', { center: centered }) }}">
-      <view>
-        <view wx:if="{{ title }}" class="van-card__title title-class">{{ title }}</view>
-        <slot wx:else name="title" />
-
-        <view wx:if="{{ desc }}" class="van-card__desc desc-class">{{ desc }}</view>
-        <slot wx:else name="desc" />
-
-        <slot name="tags" />
-      </view>
-
-      <view class="van-card__bottom">
-        <slot name="price-top" />
-        <view wx:if="{{ price || price === 0 }}" class="van-card__price price-class">{{ currency }}<text class="van-card__price-integer">{{ integerStr }}</text><text class="van-card__price-decimal">{{ decimalStr }}</text></view>
-        <slot wx:else name="price" />
-        <view wx:if="{{ originPrice || originPrice === 0 }}" class="van-card__origin-price origin-price-class">{{ currency }} {{ originPrice }}</view>
-        <view wx:if="{{ num }}" class="van-card__num num-class">x {{ num }}</view>
-        <slot wx:else  name="num" />
-        <slot name="bottom" />
-      </view>
-    </view>
-  </view>
-
-  <view class="van-card__footer">
-    <slot name="footer" />
-  </view>
-</view>

File diff suppressed because it is too large
+ 0 - 1
vant-weapp/dist/card/index.wxss