整合

@@ -117,6 +117,7 @@ Page(Object.assign({
     let originUid = options.originUid ? options.originUid : '';
 
     let uid = app.getUid();
+
     // let uid = '500027570';
     // originUid = '500027570';
 

@@ -2,14 +2,8 @@ let app = getApp();
 const windowWidth = app.globalData.systemInfo.windowWidth;
 const windowHeight = app.globalData.systemInfo.windowHeight;
 const screenHeight = app.globalData.systemInfo.screenHeight;
-<<<<<<< HEAD
 
-// const scale = windowWidth / 375;
-const scale = 0.7;
-=======
 const scale = windowWidth / 375;
-// const scale = 0.6
->>>>>>> 1f616b82a45f2f262b5ffacfda63dbcb127bbff2
 
 var Point = function(x, y) {
   return {
@@ -241,4 +235,4 @@ Page({
   hidden() {
     wx.navigateBack();
   }
-});
\ No newline at end of file
+});