修改分享等问题

@@ -5,7 +5,7 @@
   </view>
   </view>
 
 
   <view class="desc-content">
   <view class="desc-content">
-  <view class="banner" bindtap="_jumpBanner" wx:if="{{bannerSrc != null}}">
+  <view class="banner" bindtap="_jumpBanner" wx:if="{{bannerSrc != null && bannerSrc !== ''}}">
   <image class="banner-img" src="{{bannerSrc}}"></image>
   <image class="banner-img" src="{{bannerSrc}}"></image>
 </view>
 </view>
     <block wx:for="{{list}}">
     <block wx:for="{{list}}">

@@ -154,9 +154,22 @@ Page(Object.assign({
 
 
     return this.service.getMyList({type, page}).then(result => {
     return this.service.getMyList({type, page}).then(result => {
 
 
+      if(result.code !== 200 || result.data.length === 0) {
+        if(type == 0) {
+          this.setData({
+            footText: '您还没有参与的抽奖，赶紧去参加吧'
+          });
+        } else {
+          this.setData({
+            footText: '暂无已公布活动，请继续参加活动'
+          });
+        }
+      } else {
         this.setData({
         this.setData({
           footText: ''
           footText: ''
         });
         });
+      }
+      
 
 
       if (result.code !== 200) {
       if (result.code !== 200) {
         return [];
         return [];
@@ -227,7 +240,7 @@ Page(Object.assign({
       return {
       return {
         title: params.TITLE, // 分享标题
         title: params.TITLE, // 分享标题
         desc: params.DESC, // 分享描述
         desc: params.DESC, // 分享描述
-        path: `/page/subPackage/pages/zeroSell/detail?actPrizeId=${this.data.shareProduct.act_prize_id}`,
+        path: `pages/zeroSell/detail?actPrizeId=${this.data.shareProduct.act_prize_id}`,
         imageUrl: this.data.shareProduct.cover_img,
         imageUrl: this.data.shareProduct.cover_img,
         success: function() {
         success: function() {
         },
         },
@@ -240,7 +253,7 @@ Page(Object.assign({
       return {
       return {
         title: params.TITLE, // 分享标题
         title: params.TITLE, // 分享标题
         desc: params.DESC, // 分享描述
         desc: params.DESC, // 分享描述
-        path: `/page/subPackage/pages/zeroSell/detail?actPrizeId=${this.data.shareProduct.act_prize_id}&shareUid=${app.getUid()}`,
+        path: `/pages/zeroSell/detail?actPrizeId=${this.data.shareProduct.act_prize_id}&shareUid=${app.getUid()}`,
         imageUrl: this.data.shareProduct.cover_img,
         imageUrl: this.data.shareProduct.cover_img,
         success: function() {
         success: function() {
         },
         },

@@ -176,28 +176,37 @@ Page({
 
 
     this.drawLongText(this.data.product_name, pCtx, 187.5 * scale, 412 * scale, '#444444', 20, 20);
     this.drawLongText(this.data.product_name, pCtx, 187.5 * scale, 412 * scale, '#444444', 20, 20);
 
 
-    pCtx.drawImage('./images/y@2x.png', 128.5 * scale, 465 * scale, 60 * scale, 25 * scale);
+    // pCtx.drawImage('./images/y@2x.png', 128.5 * scale, 465 * scale, 60 * scale, 25 * scale);
+
+    pCtx.setFillStyle('#D0021B')
+    pCtx.setFontSize(12)
+    pCtx.fillText('￥', 128.5 * scale, 465 * scale)
+
+    pCtx.setFillStyle('#D0021B')
+    pCtx.setFontSize(26)
+    pCtx.fillText('0', 143 * scale, 465 * scale)
+
 
 
     pCtx.setFillStyle('#b0b0b0');
     pCtx.setFillStyle('#b0b0b0');
     // pCtx.setTextAlign('center');
     // pCtx.setTextAlign('center');
     const fontSize = 18;
     const fontSize = 18;
     pCtx.setFontSize(fontSize);
     pCtx.setFontSize(fontSize);
     let text = `${this.data.product_price}`;
     let text = `${this.data.product_price}`;
-    pCtx.fillText(text, (137.5 + 120) * scale, 485 * scale);
+    pCtx.fillText(text, 205 * scale, 465 * scale);
 
 
     let textRect = {width: 70};
     let textRect = {width: 70};
     if (pCtx.measureText) {
     if (pCtx.measureText) {
       textRect = pCtx.measureText(text);
       textRect = pCtx.measureText(text);
     }
     }
 
 
-    this.drawLine(pCtx, ((137.5 + 120) * scale) - (30 * scale), (485 - 15/2) * scale,  textRect.width);
+    this.drawLine(pCtx, (205 * scale) - (30 * scale), (465 - 15/2) * scale,  textRect.width);
     pCtx.setFillStyle('black')
     pCtx.setFillStyle('black')
     pCtx.fillRect(47 * scale, 562 * scale, 280 * scale, 90 * scale)
     pCtx.fillRect(47 * scale, 562 * scale, 280 * scale, 90 * scale)
     // this.drawRoundedRect(this.Rect(25 * scale, 562* scale, 280 * scale, 90 * scale), 0, pCtx);
     // this.drawRoundedRect(this.Rect(25 * scale, 562* scale, 280 * scale, 90 * scale), 0, pCtx);
     wx.getImageInfo({
     wx.getImageInfo({
       src: this.data.product_qrCode,
       src: this.data.product_qrCode,
       success: function(res) {
       success: function(res) {
-        pCtx.drawImage(res.path,  25 * scale, 550.5 * scale, 85 * scale, 85 * scale);
+        pCtx.drawImage(res.path,  53 * scale, 567.5 * scale, 80 * scale, 80 * scale);
         pCtx.draw(true);
         pCtx.draw(true);
       }
       }
     });
     });

@@ -15,7 +15,10 @@
             <view class="product-name">{{product_name}}</view>
             <view class="product-name">{{product_name}}</view>
 
 
             <view class="product-price">
             <view class="product-price">
-              <image class="price0" src="./images/y@2x.png"></image>
+              <view class="price0">
+                <text class="dollarSign">￥</text>
+                <text class="textZero">0</text>
+              </view>
               <view class="price">{{product_price}}</view>
               <view class="price">{{product_price}}</view>
             </view>
             </view>
           </view>
           </view>