update：合并

FrontCode2/sunshine_levy/package.json

@@ -11,13 +11,10 @@
   },
   "dependencies": {
     "axios": "^0.21.4",
-<<<<<<< Updated upstream
-    "js-md5": "^0.7.3",
-=======
     "element-ui": "^2.15.6",
+    "js-md5": "^0.7.3",
     "less": "^4.1.1",
     "less-loader": "^4.1.0",
->>>>>>> Stashed changes
     "lib-flexible": "^0.3.2",
     "px2rem-loader": "^0.1.9",
     "vant": "^2.12.27",

FrontCode2/sunshine_levy/src/views/index.vue

@@ -25,27 +25,15 @@
         </div>
         <div>
           <div class="gridBg centerMagin">
-<<<<<<< Updated upstream:FrontCode2/sunshine_levy/src/components/index.vue
-            <van-image
-              :src="require('@/assets/img/scan.png')"
-              class="gridImg"
-            />
-            <van-image
-              :src="require('@/assets/img/evaluation .png')"
-=======
             <van-image :src="require('@/assets/img/scan.png')" class="gridImg" />
             <van-image
               :src="require('@/assets/img/evaluation .png')"
               @click="gotoProject('pg')"
->>>>>>> Stashed changes:FrontCode2/sunshine_levy/src/views/index.vue
               class="gridImg"
             />
             <van-image
               :src="require('@/assets/img/compensation.png')"
-<<<<<<< Updated upstream:FrontCode2/sunshine_levy/src/components/index.vue
-=======
               @click="gotoProject('xy')"
->>>>>>> Stashed changes:FrontCode2/sunshine_levy/src/views/index.vue
               class="gridImg"
             />
           </div>
@@ -127,19 +115,9 @@
               />
               <span class="assessTitle">分户评估结果</span>
             </div>
-<<<<<<< Updated upstream:FrontCode2/sunshine_levy/src/components/index.vue
-            <div>
-              <van-image
-                :src="require('@/assets/img/skip.png')"
-                class="assessRightIcon"
-                round
-              />
-            </div>
-=======
             <!-- <div>
               <van-image :src="require('@/assets/img/skip.png')" class="assessRightIcon" round />
             </div>-->
->>>>>>> Stashed changes:FrontCode2/sunshine_levy/src/views/index.vue
           </div>
           <div class="assessCenter1">
             <div class="assessBox">
@@ -169,19 +147,9 @@
               />
               <span class="assessTitle">补偿协议</span>
             </div>
-<<<<<<< Updated upstream:FrontCode2/sunshine_levy/src/components/index.vue
-            <div>
-              <van-image
-                :src="require('@/assets/img/skip.png')"
-                class="assessRightIcon"
-                round
-              />
-            </div>
-=======
             <!-- <div>
               <van-image :src="require('@/assets/img/skip.png')" class="assessRightIcon" round />
             </div>-->
->>>>>>> Stashed changes:FrontCode2/sunshine_levy/src/views/index.vue
           </div>
           <div class="assessCenter2">
             <div class="assessBox">
@@ -218,17 +186,10 @@
         />
       </div>
       <div class="centerMagin">
-<<<<<<< Updated upstream:FrontCode2/sunshine_levy/src/components/index.vue
-        <span class="projectTitle" style="color: #202020">征收政策</span>
-        <div class="assessBox" style="padding-left: 5px; padding-right: 5px">
-          <span class="font11" style="color: #2c2b2b">共{{ total }}条</span>
-          <div>
-=======
         <span class="projectTitle" style="color:#202020">征收政策</span>
         <div class="assessBox" style="padding-left: 5px;padding-right: 5px;">
           <span class="font11" style="color:#2c2b2b">共{{total}}条</span>
           <!-- <div>
->>>>>>> Stashed changes:FrontCode2/sunshine_levy/src/views/index.vue
             <span class="font11">查看全部</span>
             <van-icon color="#1989fa" name="arrow" />
           </div>-->