Skip to content

Commit

Permalink
upgrade to 1.4.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Gcaufy committed Feb 25, 2017
1 parent 4d3b881 commit 045ec2a
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 42 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,7 @@ jspm_packages


# wepy cache
.wepyignore
.wepycache
dist/*

20 changes: 0 additions & 20 deletions .wepyrc

This file was deleted.

7 changes: 3 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@
"babel-plugin-syntax-export-extensions": "^6.13.0",
"babel-plugin-transform-export-extensions": "^6.8.0",
"babel-plugin-transform-runtime": "^6.15.0",
"babel-polyfill": "^6.16.0",
"babel-preset-es2015": "^6.18.0",
"babel-preset-stage-1": "^6.16.0",
"babel-runtime": "^6.18.0",
"wepy": "^1.4.1",
"wepy-com-toast": "^1.0.0"
"wepy": "^1.4.3",
"wepy-async-function": "^1.4.3",
"wepy-com-toast": "^1.0.1"
},
"devDependencies": {
"wepy-compiler-babel": "0.0.3",
Expand Down
4 changes: 2 additions & 2 deletions src/app.wpy
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ page, .body{
<script>

import wepy from 'wepy';
import "babel-polyfill";
import "wepy-async-function";

export default class extends wepy.app {

Expand Down Expand Up @@ -48,4 +48,4 @@ export default class extends wepy.app {
return res.userInfo;
}
}
</script>
</script>
4 changes: 2 additions & 2 deletions src/components/alpha.wpy
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</style>
<template>
<view class="alpha">
<block wx:for="{{tags}}" wx:for-index="index" wx:for-item="item">
<block wx:for="{{tags}}" wx:key="index" wx:for-index="index" wx:for-item="item">
<text class="item">{{item}}</text>
</block>
</view>
Expand Down Expand Up @@ -45,4 +45,4 @@
onLoad () {
}
}
</script>
</script>
4 changes: 2 additions & 2 deletions src/components/chartboard.wpy
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
</style>
<template>
<scroll-view scroll-y="1" class="chartboard{{focus ? ' fixed' : ''}}">
<block wx:for="{{message}}" wx:for-index="index" wx:for-item="item">
<block wx:for="{{message}}" wx:key="index" wx:for-index="index" wx:for-item="item">
<view class="msgarea{{item.from === 'me' ? ' me' : ' other'}}">
<image class="icon" src="{{item.icon}}"></image>
<view class="msg">{{item.msg}}</view>
Expand Down Expand Up @@ -146,4 +146,4 @@
this.$apply();
}
}
</script>
</script>
8 changes: 4 additions & 4 deletions src/components/contact.wpy
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@
<template>
<view class="contact">
<view class="toplist">
<block wx:for="{{toplist}}" wx:for-index="index" wx:for-item="item">
<block wx:for="{{toplist}}" wx:key="index" wx:for-index="index" wx:for-item="item">
<view class="item">
<view class="header">
<image class="img" src="{{item.header}}" width="70rpx" height="70rpx"></image>
Expand All @@ -96,9 +96,9 @@
</block>
</view>
<view class="friends">
<block wx:for="{{contacts}}" wx:for-index="alpha" wx:for-item="lists">
<block wx:for="{{contacts}}" wx:key="index" wx:for-index="alpha" wx:for-item="lists">
<view class="sep">{{alpha}}</view>
<block wx:for="{{lists}}" wx:for-index="index" wx:for-item="item">
<block wx:for="{{lists}}" wx:key="index" wx:for-index="index" wx:for-item="item">
<view class="user" data-wepy-params="{{item.id}}" bindtap="select">
<image src="{{item.icon}}" class="user_icon"></image>
<text class="user_name">{{item.name}}</text>
Expand Down Expand Up @@ -182,4 +182,4 @@
this.$apply();
}
}
</script>
</script>
4 changes: 2 additions & 2 deletions src/components/list.wpy
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
</style>
<template>
<view class="list">
<block wx:for="{{list}}" wx:for-index="index" wx:for-item="item">
<block wx:for="{{list}}" wx:key="index" wx:for-index="index" wx:for-item="item">
<view class="item" bindtap="click({{index}}, {{item}})">
<image class="icon" src="{{item.icon}}"></image>
<text class="title">{{item.title}}</text>
Expand Down Expand Up @@ -72,4 +72,4 @@
this.$apply();
}
}
</script>
</script>
4 changes: 2 additions & 2 deletions src/components/message.wpy
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</style>
<template>
<view class="message">
<block wx:for="{{list}}" wx:for-index="index" wx:for-item="item">
<block wx:for="{{list}}" wx:key="index" wx:for-index="index" wx:for-item="item">
<view class="item" bindtap="select({{item.id}})">
<view class="header">
<image class="img" src="{{item.icon}}"></image>
Expand Down Expand Up @@ -78,4 +78,4 @@
}

}
</script>
</script>
2 changes: 1 addition & 1 deletion src/components/tab.wpy
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@
onLoad () {
}
}
</script>
</script>
5 changes: 2 additions & 3 deletions wepy.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ module.exports = {
"plugins": [
"transform-export-extensions",
"syntax-export-extensions",
"transform-runtime"
]
}
}
Expand All @@ -25,7 +24,7 @@ module.exports = {
if (prod) {
// 压缩sass
module.exports['sass'] = {"outputStyle": "compressed"};


// 压缩js
module.exports.plugins = {
Expand All @@ -38,4 +37,4 @@ if (prod) {
}
}
};
}
}

0 comments on commit 045ec2a

Please sign in to comment.