Merge branch 'release' into uat(dev)

# Conflicts:
#	src/api/index.js
#	src/main.js
#	src/views/week/dailyDetails.vue

src/components/share.vue

@@ -185,7 +185,8 @@ export default {
   created() {
     this.zIndex = -1;
     this.canvasImageUrl = '';
-    this.vueQrText = 'http://1.npz.cn/2/' + this.reportId;
+    let links = process.env.NODE_ENV == 'production' ? ' http://1.npz.cn/3/' : 'http://1.npz.cn/2/';
+    this.vueQrText = links + this.reportId;
     this.toastLoading(0, '生成中...', true);
   },
   methods: {

src/main.js

@@ -16,8 +16,13 @@ import {
   weeklyTimeDivision,
   gcj02BD,
   verifyStoreType,
+<<<<<<< HEAD
   formatChineseDate,
   validatePhone,
+=======
+  validatePhone,
+  formatChineseDate,
+>>>>>>> release
 } from '@/utils/index';
 import { toastLoading } from '@/utils/commonVant';
 import '@vant/touch-emulator';
@@ -62,8 +67,8 @@ Vue.prototype.wx = wx;
 Vue.prototype.parseTimeParagraph = parseTimeParagraph;
 Vue.prototype.Micrometer = Micrometer;
 Vue.prototype.verifyStoreType = verifyStoreType;
-Vue.prototype.formatChineseDate = formatChineseDate;
 Vue.prototype.validatePhone = validatePhone;
+Vue.prototype.formatChineseDate = formatChineseDate;
 Vue.prototype.Toast = Toast;
 Vue.prototype.notify = Notify;
 var clipboard = new ClipboardJS('.btn');

src/views/week/dailyHistoricalDetails.vue

@@ -643,7 +643,13 @@
 <script>
 import history from '@/assets/Icon/history.png';
 import envelopes from '@/assets/envelopes.png';
-import { userTodayPlanNum, insertRemark, getDetailById, updateReport } from '@/api/index';
+import {
+  userTodayPlanNum,
+  insertRemark,
+  getDetailById,
+  updateReport,
+  buryingPoint,
+} from '@/api/index';
 import axios from 'axios';
 import { ImagePreview } from 'vant';
 import visitedRealTime from '@/views/componentsTarget/visitedRealTime';