Merge branch 'dev/v4.9.69_tsz' of qmx/jy into feature/v4.9.69

src/web/staticres/common-module/vipsubscribe/js/vip-subscribe-set-template.js

@@ -625,12 +625,9 @@ var subComponent = {
     },
     setMoneyList: function () {
       return this.moneyList.filter((item, i) => i !== 0)
-<<<<<<< HEAD
     },
     isWX: function () {
       return location.href.indexOf('front') !== -1
-=======
->>>>>>> master
     }
   },
   watch: {