merge

pages/store/buy.vue

@@ -120,12 +120,14 @@
 					address_id	: this.address.address_id,
 					remark		: this.remark || ''
 				}).then(res => {
+                    console.log(res);
 					this.$store.commit('setAddress', {})
 					this.$Router.replace({
 						name: 'Pay',
 						params: {
 							orderNo: res.order_no,
-							price  : res.total
+							price  : res.total,
+                            coins  : res.coins,
 						}
 					})
 				})
@@ -268,7 +270,8 @@
 			}
 		}
 	}
-	// footer
+	
+    // footer
 	.order-footer{
 		position: fixed;
 		bottom: 0;

pages/store/goods.vue

@@ -19,9 +19,9 @@
 			<view class="sub-title">{{goods.description}}</view>
 			<view class="box-flex">
 				<view class="price">
-					<text>¥</text>{{goods.price.show}}
+					{{goods.price.show}}<text>DT积分</text>
 				</view>
-				<view class="sales">库存量{{goods.sales}}</view>
+				<view class="sales" v-if="goods.skus">库存量{{goods.skus[0].stock}}</view>
 			</view>
             
             <!-- 店铺信息 -->
@@ -33,7 +33,7 @@
                         <view> 商品质量:<span class='no'>5.0</span> <text style="padding-left: 20rpx;">服务态度:<span class='no'>5.0</span></text> </view>
                     </view>
                 </view>
-                <view class="shopInfo-title-right" >全部商品 {{goods.shop.count || 0}} <uni-icons type="right" color="grey"/></view>
+                <view class="shopInfo-title-right" >全部商品 {{goods.shop.goods_count || 0}} <uni-icons type="right" color="grey"/></view>
 			</view>
             
             
@@ -193,8 +193,8 @@
 				color: $text-price;
 				font-size: $title-size + 10;
 				text{
-					font-size: 80%;
-					margin-right: 10rpx;
+					font-size: 60%;
+					margin-left: 10rpx;
 				}
 			}
 			.sales{

pages/store/index.vue

@@ -33,7 +33,7 @@
 						<image :src="item.cover" mode="aspectFill"></image>
 					</view>
 					<view class="news-title nowrap">{{item.name}}</view>
-					<view class="news-price nowrap">￥{{item.price.price_min}}</view>
+					<view class="news-price nowrap">{{item.price.price_min}} <text>DT积分</text></view>
 				</view>
 			</view>
 		</view>
@@ -257,6 +257,10 @@
 					font-weight: bold;
 					color: $text-price;
 					line-height: 40rpx;
+                    text{
+                        margin-left: 6rpx;
+                        font-size: 70%;
+                    }
 				}
 			}
 		}