Merge branch 'devlop' of http://git.qniao.cn/dengxiongfei/paper-shopkeeper-app into devlop

pages/mall/index.vue

@@ -156,11 +156,11 @@ export default {
             } else {
               this.logo = res.logo
             }
-            // if (res.backgroundImg === '') {
-            //   this.backgroundStyle = 'background: url("/static/imgs/mall/zsc-bg-icon.png") no-repeat;'
-            // } else {
-            //   this.backgroundStyle = 'background: url(' + res.backgroundImg + ') no-repeat;'
-            // }
+            if (res.backgroundImg === '') {
+              this.backgroundStyle = 'background: url("/static/imgs/mall/zsc-bg-icon.png") no-repeat;'
+            } else {
+              this.backgroundStyle = 'background: url(' + res.backgroundImg + ') no-repeat;'
+            }
           }
         })
         .catch((err) => {

pages/quotation-details/index.vue

@@ -192,7 +192,8 @@ export default {
     // 修改报价按钮
     editPrice() {
       var params = {
-        title: '修改报价'
+        title: '修改报价',
+		id: this.upDataObj.id
       }
       go2('submit-quotation', params)
     }

pages/submit-quotation/index.vue

@@ -44,7 +44,7 @@
           {{ items.paperName }} | {{ items.gramWeight }}g | {{ items.length }}*{{ items.width }} | {{ items.quantity }}张
         </view>
         <view class="" v-if="upDataObj.replyStatus !== 30102" @click="commodityModify(items, index)">
-          <image class="submit-image" src="../../static/imgs/trade/myPrice.png" mode=""></image>
+          <image class="submit-image" src="../../static/imgs/mall/edit.png" mode=""></image>
         </view>
       </view>
       <view class="submit-content-body">
@@ -62,7 +62,7 @@
               v-if="upDataObj.replyStatus !== 30102"
               @click="priceModify(items, index)"
               class="submit-image-price"
-              src="../../static/imgs/trade/myPrice.png"
+              src="../../static/imgs/mall/edit.png"
               mode=""
             ></image>
           </view>