Merge branch 'master' of https://gitee.com/wjl2008_admin/soulspace

.hbuilderx/launch.json

@@ -0,0 +1,18 @@
+{
+    "version" : "1.0",
+    "configurations" : [
+        {
+            "app-plus" : {
+                "launchtype" : "local"
+            },
+            "default" : {
+                "launchtype" : "local"
+            },
+            "h5" : {
+                "launchtype" : "local"
+            },
+            "provider" : "aliyun",
+            "type" : "uniCloud"
+        }
+    ]
+}

manifest.json

@@ -2,8 +2,8 @@
     "name" : "心灵空间",
     "appid" : "__UNI__BBBDFD2",
     "description" : "心灵空间",
-    "versionName" : "1.0.37",
+    "versionName" : "1.0.40",
-    "versionCode" : 1037,
+    "versionCode" : 1040,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {

pages/curriculum/list/index.vue

@@ -25,7 +25,7 @@
 					{{childrenData.title}}
 				</view>
 			</view>
-			<view class="list_block" v-if="!statusXLCP" :style="labelsList.length>0&&childrenList.length==0?`marginTop: ${45 + statusBarHeight}px;`:''">
+			<view class="list_block" v-if="!statusXLCP" :style="labelsList.length>0&&childrenList.length==0?`marginTop: ${42 }px;`:''">
 				<view class="list_item" v-if="list.length>0" v-for="(item,index) in list" :key="index" @click.stop="goToDetail(item)">
 					<view class="list_item_image">
 						<image v-if="item.squareImage" :src="item.squareImage"></image>

pages/my/set.vue

@@ -44,7 +44,7 @@
 	<u-popup key="1" v-if="showCodeImg" :show="showCodeImg" :round="10" @close="closePup">
 		<view class="box6">
 			<text style="color: #999; margin-bottom: 20rpx;">点击图片后长按图片保存到手机，或使用微信扫描二维码添加客服企业微信</text>
-			<image src="/static/qiyeWx.jpg" mode="widthFix" style="width: 100px; height: 100px; margin: 0 auto;"></image>
+			<image @click="previewImage('/static/qiyeWx.jpg')" src="/static/qiyeWx.jpg" mode="widthFix" style="width: 100px; height: 100px; margin: 0 auto;"></image>
 		</view>
 	</u-popup>
   </view>
@@ -124,6 +124,20 @@ export default {
   },
   methods: {
     ...mapMutations(["setUserInfo"]),
+	// 放大图片
+	    previewImage(url) {
+	      console.log(url);
+		  this.showCodeImg = false
+	      uni.previewImage({
+	        urls: [url],
+	        // longPressActions: {
+	        //   itemList: ["很抱歉，暂不支持保存图片到本地"],
+	        //   success: function (res) {
+	        //     // console.log(res,'+++++')
+	        //   },
+	        // },
+	      });
+	    },
 	closePup(){
 		this.showCodeImg = false
 	},