diff --git a/pages/cart/cart2/cart2.wxml b/pages/cart/cart2/cart2.wxml
index 2559628..334ba4e 100644
--- a/pages/cart/cart2/cart2.wxml
+++ b/pages/cart/cart2/cart2.wxml
@@ -263,11 +263,12 @@
                 <view class="xc-coupon-effect flex-vertical flex-space-between" wx:for="{{selected_quan_list}}"  wx:if="{{!item.is_using}}" bindtap="sele_quan_item" data-ind="{{index}}">
                     <view class="xc-goods-coupon ">
                         <view class="xc-coupon-money">{{item.Sum}}元</view>
-                        <view class="xc-coupon-money1">订单满{{item.BuySum}}元使用</view>
+                        <view class="xc-coupon-money1">订单满{{item.BuySum?item.BuySum:0}}元使用</view>
                         <view class="flex xc-coupon-time">使用期限   
 						   <view class="time"  wx:if="{{item.BeginDate && item.ValidDate}}" >
 							   {{filters.replace_time(item.BeginDate)}}至{{filters.replace_time(item.ValidDate)}}
 						   </view>
+                           <view wx:else>: 无限制</view>
                         </view>
                     </view>
                     <view class="xc-coupon-selection flex-right-vertical" >
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 457321e..0e3d7c2 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -643,8 +643,15 @@
     </view>
     <!---<view bindtap="openSpecModel" class="buy-btn cart-btn cart-btn-lg" wx:if="{{data.goods.is_virtual}}">立即购买</view>-->
     <block wx:if="{{prom_type==0}}">
-      <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
-      <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即购买</view>
+
+      <block wx:if="{{data.store_count>0}}">
+         <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view>
+         <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即购买</view>
+      </block>
+      <block wx:else>
+        <view  data-ind="1" class="join-btn cart-btn no_store">库存不足</view>
+      </block>
+
     </block>
 
     <!-------秒杀-------->
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index fe8c3ef..7105bc3 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -2226,4 +2226,8 @@ right:17rpx; top:55rpx;
   line-height:15rpx;
 }
 
-.no_pj_list{text-align: center; width: 100%; color: #999; margin-top: 30rpx; display: inline-block; font-size: 28rpx}
\ No newline at end of file
+.no_pj_list{text-align: center; width: 100%; color: #999; margin-top: 30rpx; display: inline-block; font-size: 28rpx}
+
+.join-cart>view.no_store {
+  width: 58%;
+}
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index 5d6c12a..10bef1e 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -1,6 +1,11 @@
 var auth = require("../../../utils/auth.js"),rq = require("../../../utils/request.js");
 var e = getApp(),app=e, s = e.globalData.setting,os=s,app_d = e.globalData;
 var regeneratorRuntime = require('../../../utils/runtime.js');
+const {
+  barcode,
+  qrcode
+} = require('../../../utils/index.js')
+
 
 Page({
   /**
@@ -225,13 +230,12 @@ Page({
   /**
    * 用户点击右上角分享
    */
-  onShareAppMessage: function () {
-
-  },
+  onShareAppMessage: function () {},
 
   //------卡片的显示和关闭--------
   show_tc:function(){
     if(!this.data.userInfo) return false;
+    qrcode('qrcode',this.data.userInfo.mobile, 480, 480,this);
     this.setData({
       tc_hide:false,
     });
@@ -354,7 +358,6 @@ Page({
       return false;
     }
 
-
     var url=e.currentTarget.dataset.img;
 
     switch (no) {
diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml
index 301273b..bb47691 100644
--- a/pages/user/index/index.wxml
+++ b/pages/user/index/index.wxml
@@ -259,7 +259,8 @@
 				</view>
 			</view>
 			<view class="m_ta">
-				<image class='g_img' src='https://mshop.yolipai.net//index.php?m=Home&c=Index&a=qr_code&data={{userInfo.mobile}}'></image>
+				<!--<image class='g_img' src='https://mshop.yolipai.net//index.php?m=Home&c=Index&a=qr_code&data={{userInfo.mobile}}'></image>-->
+				<canvas class="g_img" canvas-id="qrcode" />
 			</view>
 			<view class="s_sao">扫一扫上面的二维码图案，即可消费</view>
 		</view>