Merge branch 'fix/coupon' into fix/goods

# Conflicts:
#	package-lock.json
#	package.json

.npmrc

+registry=http://npmprivate.quantgroups.com/
\ No newline at end of file

app/web/page/activity/component/BackTop/index.vue

@@ -122,6 +122,10 @@ export default {
       }
     },
     onShareOverlayClick() {
+      if(this.pageInfo.diversion){
+        window.location.href = this.pageInfo.diversion;
+        return;
+      }
       if (isH5Normal) {
         const fromHost = getParameterByName('fromHost', window.location.href);
         const loginUrl = `${fromHost}/login?redirectUrl=${window.location.href}`;

config/wxVertify.ts

@@ -15,4 +15,6 @@ export default {
   '/tPICMyeJfv.txt': fs.readFileSync(path.join(__dirname, '/wxVertify/tPICMyeJfv.txt')),
   '/UBRJar2pST.txt': fs.readFileSync(path.join(__dirname, '/wxVertify/UBRJar2pST.txt')),
   '/yB3tnMTnRc.txt': fs.readFileSync(path.join(__dirname, '/wxVertify/yB3tnMTnRc.txt')),
+  '/gAnCcSGwFu.txt': fs.readFileSync(path.join(__dirname, '/wxVertify/gAnCcSGwFu.txt')),
+  '/qqCExxuPJ7.txt': fs.readFileSync(path.join(__dirname, '/wxVertify/qqCExxuPJ7.txt')),
 };

config/wxVertify/gAnCcSGwFu.txt

+a8ae84f68ea72f82beff325a59fd2c58
\ No newline at end of file

config/wxVertify/qqCExxuPJ7.txt

+a1da927722f735a09065407e32beb56a
\ No newline at end of file