Merge branch 'master' into ls

ghsApp/src/pagesClient/member/addCustomer.vue

@@ -6,7 +6,7 @@
     <form @submit="formSubmit">
       <view class="module-com">
         <tui-list-cell class="line-cell" :hover="false" >
-          <div class="tui-title">花店1</div>
+          <div class="tui-title">花店名称</div>
           <input v-model="form.name1" type="text" placeholder-class="phcolor" placeholder-style="color:#CCCCCC" class="tui-input" name="name1" placeholder="请输入名称" />
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false">