上线后第一次更新

适配了formid只能给自己发的问题，修复了个人信息错误处理，更新主页图片显示方式，以及欢迎页背景图片存贮位置

cloudfunctions/sM_examine/index.js

@@ -61,7 +61,7 @@ var addProduct = async (event) => {
 
 //把这个新商品id和名称push到用户信息里
 var rewriteUserInfo = async (newId,event) => {
-  	var res = await db.collection('sM_userInfo').doc(event.userInfo._id).update({
+  	var res = await db.collection('sM_userInfo').doc(event.userInfos._id).update({
 		data: {
 			issue: db.command.push({
 				id:newId,
@@ -74,7 +74,7 @@ var rewriteUserInfo = async (newId,event) => {
 			return {
 				errCode: 102,
 				errMsg: '新商品id注入用户信息里时用户id错误。',
-				userId: event.userInfo._id,
+				userId: event.userInfos._id,
 			};
 		else 
 			return {
@@ -129,6 +129,7 @@ var update = async (event) => {
 			isfree: event.isfree,
 			photos: event.photos,
 			time: (new Date(new Date().getTime() + 1000 * 60 * 60 * 8)).Format("yyyy-MM-dd hh:mm:ss"), //+8时差
+			formId: event.formId2,
 		}
 	}).then(res => {
 		return {
@@ -155,7 +156,6 @@ var update = async (event) => {
 			sendName: event.userInfos.userName,
 			title: event.title,
 			formId1: event.formId1,
-			formId2: event.formId2,
 			examineId: res.errMsg,
 	  	}
 	}).then(res => {

cloudfunctions/sM_sendMsg/index.js

@@ -57,47 +57,13 @@ var startExamine = async (event) => {
 		};
 	}).catch(err => {
 		return {
-			errCode: 107,
+			errCode: 1071,
 			errMsg: '审核开始给用户发送消息失败',
 			err: err,
 		}
 	})
 	
-	if(userRes.errCode !== 200) return userRes;
-
-	//给管理员发消息说有东西等待审核
-	var adminRes = await cloud.openapi.templateMessage.send({
-	  touser: 'otxHM4icvFkfMcaqxTH1zSNKhKVs',
-	  data: {
-	    keyword1: {
-				//申请人
-	      value: event.sendName
-	    },
-	    keyword2: {
-				//申请时间
-	      value: (new Date(new Date().getTime() + 1000 * 60 * 60 * 8)).Format("yyyy-MM-dd hh:mm:ss") //+8时差
-	    },
-	    keyword3: {
-				//审核类型
-	      value: "发布商品"
-	    }
-	  },
-	  templateId: 'AhGvD5GBiM16D1dLnOxdUjTx0-NyID0HlbH904Lh8XM',
-	  formId: event.formId2,
-	  page:'components/examine/examine?'+'id='+event.examineId,
-	}).then(res => {
-		return {
-			errCode: 200,
-			errMsg: 'ok'
-		}
-	}).catch(err => {
-		return {
-			errCode: 107,
-			errMsg: '审核开始给管理员发送信息失败。',
-			err: err,
-		}
-	})
-	return adminRes;
+	return userRes;
 }
 
 //审核结果
@@ -132,7 +98,7 @@ var passExamine = async (event) => {
 		}
 	}).catch(err => {
 		return {
-			errCode: 107,
+			errCode: 1073,
 			errMsg: '审核结束时信息发送错误',
 			err: err,
 		}

miniprogram/components/createProj/createProj.js

@@ -254,6 +254,7 @@ Page({
           image:'../../images/info.png',          
           duration: 2000
         })
+        console.log(res.result)
       } else {
         wx.showToast({
           title: '成功',

miniprogram/components/examine/examine.js

@@ -126,7 +126,7 @@ Page({
         photos: proj.photos,
         oldId: proj._id,
         remarks: this.data.inputValue,
-        formId:e.detail.formId
+        formId:proj.formId,
       }
     } else {
       var data = {
@@ -134,7 +134,7 @@ Page({
         userInfos: proj.userInfo,
         oldId:proj._id,
         remarks: this.data.inputValue,
-        formId: e.detail.formId
+        formId: proj.formId
       }
     }
     wx.cloud.callFunction({
@@ -146,17 +146,18 @@ Page({
         icon: 'success',
         duration: 2000
       })
+      console.log(res.result)
       wx.setStorageSync('refreshMain',true)
       wx.setStorageSync('refreshMine',true)
-      if(!this.data.fromApp) {
-        wx.switchTab({
-          url: '../mine/mine'
-        })
-      } else {
-        wx.navigateBack({
-          delta: 1
-        });
-      }
+      // if(!this.data.fromApp) {
+      //   wx.switchTab({
+      //     url: '../mine/mine'
+      //   })
+      // } else {
+      //   wx.navigateBack({
+      //     delta: 1
+      //   });
+      // }
     }).catch(err => {
       console.log(err)
     })

miniprogram/components/fuzzySearch/fuzzySearch.wxml

@@ -45,7 +45,7 @@
     </view>
     <view class="pro-title">#{{item.title}}#</view>
     <view class="pro-detail">{{item.details}}</view>
-    <image mode='widthFix' class="pro-img" src="{{item.photos[0]}}" />
+    <image mode='aspectFill' class="pro-img" src="{{item.photos[0]}}" />
     <view class='pro-footer'>
       <view class="pro-tag">
         <view class="padding-xs">

miniprogram/components/homePage/homePage.wxml

@@ -87,7 +87,7 @@
     </view>
     <view class="pro-title">#{{item.title}}#</view>
     <view class="pro-detail">{{item.details}}</view>
-    <image mode='widthFix' class="pro-img" src="{{item.photos[0]}}" />
+    <image mode='aspectFill' class="pro-img" src="{{item.photos[0]}}" />
     <view class='pro-footer'>
       <view class="pro-tag">
         <view class="padding-xs">

miniprogram/components/signin/signin.js

@@ -195,6 +195,8 @@ Page({
 
   //出错处理
   dealErr() {
+    wx.hideLoading();
+    var that = this;
     wx.showModal({
       title: '警告',
       content: '网络不佳，设置失败',
@@ -237,7 +239,7 @@ Page({
       wx.hideLoading({});
       wx.showModal({
         title: '警告',
-        content: '网络不佳，登陆失败',
+        content: '网络不佳，刷新失败',
         confirmText: '重试',
         success (res) {
           if (res.confirm) {

miniprogram/components/signin/signin.wxml

@@ -1,6 +1,6 @@
 <cu-custom  isBack="{{true}}"style="color:#fff;z-index:20;" ><view slot="content" style="color:#fff;"></view></cu-custom>
 <!-- background -->
-<image src="cloud://cloud-83621f.636c-cloud-83621f/cherryStore/abstract-dark.jpg" class="bg" mode="aspectFill"/>
+<image src="../../images/abstract-dark.jpg" class="bg" mode="aspectFill"/>
 
 <view class="main-page">
     <view class="welcome">欢迎使用</view>

miniprogram/components/tagSearch/tagSearch.wxml

@@ -34,7 +34,7 @@
     </view>
     <view class="pro-title">#{{item.title}}#</view>
     <view class="pro-detail">{{item.details}}</view>
-    <image mode='widthFix' class="pro-img" src="{{item.photos[0]}}" />
+    <image mode='aspectFill' class="pro-img" src="{{item.photos[0]}}" />
     <view class='pro-footer'>
       <view class="pro-tag">
         <view class="padding-xs">

miniprogram/components/welcome/welcome.wxml

@@ -1,6 +1,6 @@
 <!--components/welcome/welcome.wxml-->
 <!-- background -->
-<image src="cloud://cloud-83621f.636c-cloud-83621f/cherryStore/abstract-dark.jpg" class="bg" mode="aspectFill"/>
+<image src="../../images/abstract-dark.jpg" class="bg" mode="aspectFill"/>
 <view class="main-page">
     <view class="userAvatar-box">
         <open-data type="userAvatarUrl" class="png" style="height:200rpx; width:200rpx; border-radius: 50%;"></open-data>