merge

unpackage/dist/dev/app-plus/app-view.js

@@ -4057,6 +4057,7 @@ var render = function() {
                                 ],
                                 1
                               )
+<<<<<<< HEAD
                             : _vm._e(),
                           _vm._$g(102, "i")
                             ? _c(
@@ -4091,6 +4092,42 @@ var render = function() {
                                 1
                               )
                             : _vm._e()
+=======
+                            ],
+                            1
+                          ),
+                          _c(
+                            "v-uni-view",
+                            {
+                              staticClass: _vm._$g(102, "sc"),
+                              attrs: { _i: 102 },
+                              on: {
+                                click: function($event) {
+                                  return _vm.$handleViewEvent($event)
+                                }
+                              }
+                            },
+                            [
+                              _c("v-uni-image", {
+                                staticClass: _vm._$g(103, "sc"),
+                                attrs: {
+                                  src: "/static/user/userTool-05.png",
+                                  mode: "",
+                                  _i: 103
+                                }
+                              }),
+                              _c(
+                                "v-uni-view",
+                                {
+                                  staticClass: _vm._$g(104, "sc"),
+                                  attrs: { _i: 104 }
+                                },
+                                [_vm._v("扫码核销")]
+                              )
+                            ],
+                            1
+                          )
+>>>>>>> 6860a9e43c07f075d33116b4721b82922f7e47f7
                         ],
                         1
                       )
@@ -18946,7 +18983,7 @@ var render = function() {
     [
       _c("v-uni-image", {
         staticClass: _vm._$g(1, "sc"),
-        attrs: { src: "/static/images/hexiao_bg.png", mode: "widthFix", _i: 1 }
+        attrs: { src: "/static/imgs/hexiao_bg.png", mode: "widthFix", _i: 1 }
       }),
       _c(
         "v-uni-view",
@@ -19382,7 +19419,7 @@ var render = function() {
               _c("v-uni-image", {
                 staticClass: _vm._$g(2, "sc"),
                 attrs: {
-                  src: "/static/images/ver-bg.png",
+                  src: "/static/imgs/ver-bg.png",
                   mode: "widthFix",
                   _i: 2
                 }
@@ -19539,7 +19576,7 @@ var render = function() {
                       _c("v-uni-image", {
                         staticClass: _vm._$g(21, "sc"),
                         attrs: {
-                          src: "/static/images/boss.png",
+                          src: "/static/imgs/top_logo.png",
                           mode: "mode",
                           _i: 21
                         }