Merge branch 'dev' into feature-zyw

src/component/imageSwiper/imageSwiper.js

@@ -23,6 +23,7 @@ Component({
     imgUrls: [],
     indicatorDots: false,
     autoplay: true,
+    circular: true,
     interval: 5000,
     duration: 1000,
     isAuthorization: false

src/component/imageSwiper/imageSwiper.wxml

@@ -4,6 +4,7 @@
   autoplay="{{autoplay}}"
   interval="{{interval}}"
   duration="{{duration}}"
+  circular="{{circular}}"
   class="image-swiper"
 >
   <block wx:for="{{imageData}}" wx:key="{{item}}">

src/pages/memberOfOwn/memberOfOwn.wxml

@@ -99,6 +99,7 @@
 						<textarea
 						 bindblur="bindTextAreaBlur"
 						 placeholder="请填写真实收件地址"
+						 placeholder-style="color:#999;font-size:13px;"
 						 name="address"
 						 auto-height
 						 maxlength='30'

src/pages/memberOfOwn/memberOfOwn.wxss

@@ -91,7 +91,7 @@ page{
 
 .right-input {
   width: 100%;
-  color: #666;
+  color: #999;
 }
 
 .form-label{
@@ -112,7 +112,7 @@ textarea {
 }
 
 .form-input {
-  color: rgb(112, 112, 112);
+  color: #999;
   font-size: 26rpx;
 }