diff --git a/manifest.json b/manifest.json
index 4575253..07f08b5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -313,7 +313,7 @@
             "urlCheck" : false,
             "es6" : false,
             "postcss" : false,
-			"enhance": true
+            "enhance" : true
         },
         "usingComponents" : true
     },
diff --git a/pages/account/myOrders.vue b/pages/account/myOrders.vue
index cd1635f..94a3d03 100644
--- a/pages/account/myOrders.vue
+++ b/pages/account/myOrders.vue
@@ -492,7 +492,7 @@
 						<text>Credit/Debit Card</text>
 					</view>
 				</view>
-				<!-- 				<view class="pay_item" @click="selectPay(2)">
+				<!--<view class="pay_item" @click="selectPay(2)">
 					<image src="../../static/img/select1.png" mode="" class="pay_item_select" v-if="pay_index==2"></image>
 					<image src="../../static/img/select2.png" mode="" class="pay_item_select" v-else></image>
 					<view class="pay_item_right">
@@ -687,7 +687,7 @@
 					}
 					defaultRequest2(data).then(res => {
 						console.info(res, '支付')
-						if (res.error == 0) {
+						if (res.error == 1) {
 							let url = res.data.prepay_data.checkoutnow_url
 							console.log(url)
 							// plus.runtime.openURL(res.data.prepay_data.checkoutnow_url)
@@ -699,9 +699,9 @@
 				} else {
 					defaultRequest2(this.payQuery).then(res => {
 						console.info(res)
-						if (res.error == 0) {
+						if (res.error == 1) {
 							//订单对象，从服务器获取
-							if (res.data.need_pay_amount == 0) return
+							if (res.data.need_pay_amount == 1) return
 							uni.requestPayment({
 								provider: 'alipay',
 								orderInfo: res.data.prepay_data.order_info, //支付宝订单数据
diff --git a/pages/category/productList.vue b/pages/category/productList.vue
index d989354..4a32fff 100644
--- a/pages/category/productList.vue
+++ b/pages/category/productList.vue
@@ -69,7 +69,7 @@
 					</view>
 				</view>
 			</view>
-<!-- 
+
 			<view class="product1" v-show="pets_index==0">
 				<custom-waterfalls-flow ref="waterfallsFlowRef" :value="list" imageKey="goods_img"
 					@wapperClick="goDetails" @imageClick="goDetails">
@@ -85,7 +85,7 @@
 						</view>
 					</template>
 				</custom-waterfalls-flow>
-			</view> -->
+			</view>
 			<view class="bootom_last" v-if="bootom == 1">-THE END-</view>
 			<view class="mask" @click="isCart=false" v-show="isCart"></view>
 			<view class="addCard" v-show="isCart">
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7d6da8b..c32157c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1357,6 +1357,7 @@
 						</view>
 					</view>
 					<!-- 轮播图 -->
+<<<<<<< HEAD
 					<!-- <view v-if="item.zone_code=='HONLIST2' && item.zone_status=='NORMAL'" :current="mycurrent">
 						<swiper v-for="(item1,index1) in item.blocks" :key="item1.block_id" style="height: 600rpx;" previous-margin="140rpx" next-margin="140rpx" @change="handlechange" :current="mycurrent"   :indicator-dots="true"  :circular="true" :interval="3000" :duration="1000">
 							<swiper-item v-for="i,index in 10" :key="i">
@@ -1364,6 +1365,21 @@
 									<image :src="item1.block_pic" mode=""
 												:style="{width:(item.zone_code=='HONLIST2')?420+'rpx':'',height:item.zone_column+'rpx'}"
 												@click="imgTo(itesm1)"></image>
+=======
+					<!-- <view> -->
+						<!-- previous-margin指的是当前图片的左边框距离屏幕最左边的距离 -->
+						<!-- <swiper class="spike1 page_padding" scroll-x="true" :show-scrollbar="false"
+							v-if="item.zone_code=='HONLIST2' && item.zone_status=='NORMAL'" style="height: 600rpx;"
+							previous-margin="140rpx" next-margin="140rpx" @change="handlechange" :current="mycurrent"
+							:indicator-dots="true" :circular="true" :interval="3000" :duration="1000">
+							<swiper-item v-for="(item1,index1) in item.blocks" :key="item1.block_id"> -->
+								<!-- v-for="(item1,index1) in item.blocks" :key="item1.block_id"> -->
+								<!--   v-for="i,index in 10" :key="i" -->
+								<!-- <view :class="['swiper-items',index==mycurrent ? 'active' : '']">
+									<img :src="item1.block_pic" mode=""
+										:style="{width:(item.zone_code=='HONLIST2')?420+'rpx':'',height:item.zone_column+'rpx'}"
+										@click="imgTo(item1)">
+>>>>>>> parent of 3509ff0 (样式修改)
 								</view>
 							</swiper-item>
 						</swiper>
diff --git a/pages/order/confirmation.vue b/pages/order/confirmation.vue
index 91b1f55..4a376a3 100644
--- a/pages/order/confirmation.vue
+++ b/pages/order/confirmation.vue
@@ -443,7 +443,7 @@
 					defaultRequest2(data).then(res => {
 						////////console.info(data,'支付')
 						//////console.log(res)
-						if (res.error == 0) {
+						if (res.error == 1) {
 							// plus.runtime.openURL(res.data.prepay_data.checkoutnow_url)
 							// this.src = res.data.prepay_data.checkoutnow_url
 							uni.navigateTo({
diff --git a/pages/order/details.vue b/pages/order/details.vue
index 7f28893..38a0051 100644
--- a/pages/order/details.vue
+++ b/pages/order/details.vue
@@ -370,8 +370,8 @@
 					defaultRequest2(data).then(res => {
 						console.info(data)
 						console.log(res)
-						if (res.error == 0) {
-							if (res.data.need_pay_amount == 0) return
+						if (res.error == 1) {
+							if (res.data.need_pay_amount == 1) return
 							// plus.runtime.openURL(res.data.prepay_data.checkoutnow_url)
 							// this.src = res.data.prepay_data.checkoutnow_url
 							uni.navigateTo({