Merge remote-tracking branch 'origin/dev_jd' into dev_jd

main.js

@@ -12,7 +12,7 @@ import scrollList from "@/common/scroll-list/scroll-list";
 Vue.use(uView);
 Vue.prototype.http = http
 // 订阅消息模板id
-Vue.prototype.nc_templateid = '59-hfHg3CnDvgVEnjqxiHRFwpABehc5lZxHQeUctlrg'
+Vue.prototype.nc_templateid = '7iCStgZrlPdT6FYtybl5orIHVjGBENdm8MsOTNN7iMk'
 App.mpType = 'app'
 Vue.component('ActiveForm', ActiveForm)
 Vue.component('scrollList', scrollList)

manifest.json

@@ -59,7 +59,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx8fd4dc1c4b9f6f41",
+        "appid" : "wx237e45bea2220a37",
         "setting" : {
             "urlCheck" : false,
             "minified" : true,

pages/personal.vue

@@ -11,7 +11,7 @@
                 <div class="ps__info">
                     <div class="info__cover">
                         <image v-if="avatar" :src="avatar" />
-                        <image v-else src="@/static/my/my2.png" />
+                        <image v-else src="@/static/my/my2.jpg" />
                     </div>
                     <div>
                         <div class="info__name">{{userInfo.nickName || '默认昵称'}}</div>