1.0.10

app.js

@@ -14,7 +14,7 @@ App({
     this.globalData.systemInfo = wx.getSystemInfoSync();
   },
   globalData: {
-    version: "1.0.10",
+    version: "1.0.11",
     IsProduction: true,
     ProgramID: 105,
     AppID: "wx1fef080f74481cbd",

app.json

@@ -7,7 +7,6 @@
     "pages/main/detail",
     "pages/main/list",
     "pages/main/errorlist",
-    "pages/about/share",
     "pages/about/payfinished",
     "pages/main/default"
   ],

pages/about/share.js

@@ -1,76 +0,0 @@
-import common from '../../utils/util';
-import server from '../../utils/main';
-
-const app = getApp();
-var imageIndex = 0;
-var arrBuildImageSource = [];
-var arrBuildImageTarget = [];
-
-Page({
-  data: {
-  },
-  onLoad: function (options) {
-    this.setData({
-      Height: common.getSystemHeight(),
-    });
-  },
-  onUnload: function () {
-    wx.setStorageSync("IsShare", true);
-  },
-  buildShareImage: function () {
-    imageIndex = 0;
-    arrBuildImageSource = [];
-    for (var i = 2; i < 6; i++)
-      arrBuildImageSource.push("../../images/programsystem_screenshot_pic0" + i + ".png");
-    arrBuildImageTarget = [];
-
-    this.buildImage();
-  },
-  buildImage: function () {
-    var that = this;
-    var ctx = wx.createCanvasContext("MyCanvas", this);
-    ctx.drawImage(arrBuildImageSource[imageIndex], 0, 0, 400, 300);
-    var avatar = wx.getStorageSync("Avatar");
-    if (avatar) {
-      ctx.drawImage(avatar, 15, 250, 40, 40);
-      ctx.drawImage("../../images/universalpic_mask_face_size01.png", 13, 248, 44, 44);
-
-      ctx.fillStyle = "#ffffff";
-      ctx.setFontSize(14);
-      ctx.fillText(app.globalData.userInfo.NickName, 65, 264);
-    }
-    ctx.draw(true, function (n) {
-      wx.canvasToTempFilePath({
-        x: 0,
-        y: 0,
-        width: 400,
-        height: 300,
-        canvasId: 'MyCanvas',
-        success: function (res2) {
-          console.log(res2.tempFilePath);
-
-          arrBuildImageTarget.push(res2.tempFilePath);
-
-          if (arrBuildImageTarget.length < arrBuildImageSource.length) {
-            imageIndex++;
-            that.buildImage();
-          }
-          else {
-            wx.previewImage({
-              current: arrBuildImageTarget[0], // 当前显示图片的http链接
-              urls: arrBuildImageTarget // 需要预览的图片http链接列表
-            });
-          }
-        }
-      })
-    });
-
-  },
-  onShareAppMessage: function () {
-    return {
-      title: app.globalData.ShareTitle,
-      path: 'pages/index/index?UserID=' + app.globalData.userInfo.UserID,
-      imageUrl: app.globalData.ShareImageUrl,
-    }
-  },
-});

pages/about/share.json

@@ -1,6 +0,0 @@
-{
-  "navigationBarBackgroundColor": "#99607C",
-  "navigationBarTextStyle": "white",
-  "navigationBarTitleText": "分享",
-  "backgroundColor": "#99607C"
-}

pages/about/share.wxml

@@ -1,36 +0,0 @@
-<view class="container FlexColumn" style='height:{{Height}}rpx;'>
-  <view class="btn">
-    <view class="btn1 FlexColumn">
-      <view class="panel1 FlexRow">
-        <view class="line"></view>
-        <view class="panel11 FlexColumn">
-          <view class="panel111 FlexColumn">
-            把我
-          </view>
-          <view class="panel112 FlexColumn">
-            分享给您的朋友吧
-          </view>
-        </view>
-      </view>
-      <view class="panel2 FlexRow">
-        <button class="panel2_1 FlexColumn" open-type="share">
-          <view class="textTitle">
-            <view class="textTitle1">转发给朋友</view>
-            <view class="textTitle2">转发给朋友</view>
-          </view>
-          <view class="panel212">直接转发</view>
-        </button>
-        <view class="line2"></view>
-        <view class="panel2_2 FlexColumn" bindtap='buildShareImage'>
-          <view class="textTitle textTitle3">
-            <view class="textTitle1">存图发朋友圈</view>
-            <view class="textTitle2">存图发朋友圈</view>
-          </view>
-          <view class="panel2121 panel212">生成图片 长按存图</view>
-        </view>
-      </view>
-    </view>
-  </view>
-  <image src="../../images/universalpic_share_guide_bg.png" class="universalpic_share_guide_bg" />
-</view>
-<canvas class='Canvas' canvas-id="MyCanvas"></canvas>

pages/about/share.wxss

@@ -1,132 +0,0 @@
-.container {
-  background-color: #99607c;
-  justify-content: flex-start;
-}
-
-.btn {
-  width: 610rpx;
-  height: 422rpx;
-  background-color: #67453c;
-  margin-top: 212rpx;
-  border-radius: 14rpx;
-  z-index: 10;
-}
-
-.btn1 {
-  width: 100%;
-  height: 402rpx;
-  background-color: #ffd48b;
-  position: relative;
-  border-radius: 14rpx;
-  top: 0;
-}
-
-.panel1 {
-  width: 100%;
-  height: 260rpx;
-  border-bottom: 2rpx solid #e4b06c;
-  justify-content: flex-start;
-}
-
-.line {
-  width: 16rpx;
-  height:140rpx;
-  background-color: #EC4C56;
-  margin-left: 50rpx;
-}
-
-.panel11{
-  align-items: flex-start;
-  margin-left: 30rpx;
-}
-.panel111{
-  font-size:64rpx;
-  font-weight: 500;
-}
-.panel112{
-  font-size:48rpx;
-  font-weight: 500;
-}
-
-.panel2 {
-  width: 100%;
-  height: 140rpx;
-  background-color: #fec579;
-  border-bottom-left-radius: 14rpx;
-  border-bottom-right-radius: 14rpx;
-}
-
-.line2 {
-  width: 2rpx;
-  height: 90rpx;
-  background-color: #e4b06c;
-}
-
-.panel2_1 {
-  width: 305rpx;
-  height: 140rpx;
-  background-color: #fec579;
-  border-bottom-left-radius: 14rpx;
-  justify-content: flex-start;
-  padding-left: 0;
-  padding-right: 0;
-}
-
-.panel2_1::after {
-  border: 0px;
-}
-
-.panel2_2 {
-  width: 305rpx;
-  height: 140rpx;
-  background-color: #fec579;
-  border-bottom-right-radius: 14rpx;
-  justify-content: flex-start;
-}
-
-.textTitle {
-  font-size: 36rpx;
-  font-weight: 500;
-  width: 180rpx;
-  height:50rpx;
-  margin-top: 30rpx;
-}
-.textTitle3 {
-  width: 216rpx;
-}
-.textTitle1 {
-  -webkit-text-stroke:8rpx #8B4C28;
-  position: absolute;
-  text-align: center;
-  line-height: 50rpx;
-}
-.textTitle2 {
-  color: #FFFFFF;
-  position: absolute;
-  text-align: center;
-  line-height: 50rpx;
-}
-.panel212{
-  font-size: 22rpx;
-  font-weight: 500;
-  color:#8B4C28;
-  margin-top: -2rpx;
-}
-.panel2121{
-  margin-top: 8rpx;
-}
-
-.universalpic_share_guide_bg {
-  width: 100%;
-  height: 440rpx;
-  position: fixed;
-  bottom: 0;
-}
-
-.Canvas{
-  width: 400px; 
-  height: 300px;
-  position: fixed;
-  left:760rpx;
-  top:0rpx;
-}

pages/main/default.js

@@ -72,16 +72,6 @@ Page({
         }
       }
     });
-
-    // if (list && list.length >= 5) {
-    //   common.getStorageValue(that, "IsShare", false, function () {
-    //     if (!that.data.IsShare) {
-    //       wx.navigateTo({
-    //         url: '../about/share',
-    //       });
-    //     }
-    //   });
-    // }
   },
   downloadUserAvatar: function () {
     var avatar = wx.getStorageSync("Avatar");

pages/main/default.wxml

@@ -120,11 +120,6 @@
       <button class="panel FlexRow" open-type="share">
         <view>转发给朋友</view>
       </button>
-      <!-- <view class="line"></view>
-      <view class="panel2 panel FlexColumn" bindtap='buildShareImage' >
-        <view>存图发到朋友圈</view>
-        <view class="text3">点击后生成图片，长按图片选择保存到相册</view>
-      </view> -->
       <view class="line"></view>
       <view class="line2"></view>
       <view class="line"></view>