解决冲突

pages/newDrug/detail.vue

@@ -11,12 +11,12 @@
     <view class="Scanning_cont">
       <template v-if="config.showDrugsBagDetails == 1">
         <view class="column head">
-          <view class="value1" @click="viewName(item)">药品名称+规格<text class="red">（{{drugsList.length}}）</text></view>
+          <view class="value1">药品名称+规格<text class="red">（{{drugsList.length}}）</text></view>
           <view class="value2">数量</view>
         </view>
         <scroll-view scroll-y class="scrollContent">
           <view class="column" v-for="item in drugsList" :key="item.id">
-            <view class="value1">{{item.drugsInfo}} {{item.model}}</view>
+            <view class="value1" @click="viewName(item)">{{item.drugsInfo}} {{item.model}}</view>
             <view class="value2">{{item.drugsNum}}</view>
           </view>
         </scroll-view>

pages/searchMuti/searchMuti.vue

@@ -241,20 +241,9 @@
     justify-content: center;
     align-items: center;
     box-sizing: border-box;
-<<<<<<< HEAD
-    border-radius: 4rpx;
-    box-shadow: 0 2rpx 12rpx rgba(0, 0, 0, 0.24);
-    background-color: #e5e9ed;
-
-    .toolbar-sao {
-      font-size: 36rpx;
-      color: #49b856;
-    }
-=======
     border-radius: 10rpx;
     background-color: #8F939C;
 		color: #fff;
->>>>>>> 4d9d7bbc8b04c37d7024b340569a845c221b83d2
   }
 
   .search-box {