'bug修改'

components/posterbox/index.wxml

 <view class="sjd-poster-box">
     <view class="img-wrap">
         <view class="img-box">
-            <image class="poster-img" src="{{canvasimagepath}}" mode="aspectFit|aspectFill|widthFix" lazy-load="false" binderror="" bindload="" bindtap="previewImage"></image>
+            <image class="poster-img" src="{{canvasimagepath}}" mode="aspectFit" lazy-load="false" binderror="" bindload="" bindtap="previewImage"></image>
             <view class="close-box" bindtap="closeposter">
                 <image class="close-icon" src="{{imageRoot}}2c/clockdetail/close.png?{{imageVersion}}" mode="aspectFit|aspectFill|widthFix"></image>
                 <view class="mask"></view>

components/posterbox/index.wxss

@@ -67,7 +67,7 @@
 }
 .sjd-poster-box .img-box {
     width: 590rpx;
-    height: 1054rpx;
+    height: 960rpx;
     /* box-shadow: 0px 3rpx 38rpx 0px rgba(0, 0, 0, 0.13); */
     /* margin: 20rpx auto 30rpx; */
     position: relative;
@@ -79,7 +79,7 @@
     /* width: 513rpx;
     height: 913rpx; */
     width: 100%;
-    height: 100%;
+    height: 960rpx;
     display: block;
 }
 .sjd-poster-box .img-box .close-box{

src/pages/themeindex/landpage.js

@@ -917,10 +917,6 @@ Page({
     const visitor = LocalStorage.getItem("visitor");
     let that = this;
     const { encryptedData, iv } = e.detail;
-<<<<<<< HEAD
-    if (e.detail.errMsg == "getPhoneNumber:fail user deny") {
-=======
-    console.log(e.detail, 'e.detail');
     if (e.detail.errMsg == 'getPhoneNumber:fail user deny') { //用户点击拒绝
       wx.login({
         success(res) {
@@ -930,7 +926,6 @@ Page({
           });
         }
       });
->>>>>>> 71b92eb2b99054ed49e185b2be5c08e5ef1b470a
       wx.showToast({
         title: "获取手机号失败",
         icon: "none"
@@ -980,7 +975,7 @@ Page({
         ? {}
         : {
             code: this.data.sessionCode,
-            encryptData: this.data.encryptedData,
+            encryptedData: this.data.encryptedData,
             iv: this.data.iv
           };
     subjectStudentSign(
@@ -997,8 +992,6 @@ Page({
             url: `/src/pages/themeindex/index?&tid=${this.data.themeSelect.id}&sid=${this.data.sid}`
           });
         } else {
-<<<<<<< HEAD
-=======
           wx.login({
             success(res) {
               const sessionCode = res.code;
@@ -1007,7 +1000,6 @@ Page({
               });
             }
           });
->>>>>>> 71b92eb2b99054ed49e185b2be5c08e5ef1b470a
         }
       })
       .catch(err => {