Merge branch 'dev_1.1.2' of https://git.yishihui.com/DeNet/de-net into dev_1.1.2

src/view/popup/setting/index.vue

@@ -6,7 +6,7 @@
                 class="icon-arrow"
                 @click="back"
             />
-            <span>SET</span>
+            <span>Settings</span>
         </div>
 
         <div class="item">